*************************************************************** *************************************************************** 51 file changed, 923 insertions(+), 155 deletions(-) *************************************************************** *************************************************************** ========platform/bionic between android-7.1.2_r17..android-7.1.2_r24========= linker/linker.cpp | 3 +++ 1 file changed, 3 insertions(+) b928447d6 linker: remove link from external library on unload ========platform/build between android-7.1.2_r17..android-7.1.2_r24========= core/build_id.mk | 2 +- core/version_defaults.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 2dd5b56d4 Version bump to NJH47D df00a9a31 [DO NOT MERGE]Updating security string to 2017-07-05 on nyc-dev bug:38342695 (cherry picked from commit 96d958c34509a65e5f7787945f9923fb44c42f05) f1af38350 [DO NOT MERGE]Updating security string to 2017-07-01 on nyc-dev bug:38342695 (cherry picked from commit 77dad3dfcd677136f6657e1b95dd84ed1be1d728) ========device/google/marlin-kernel between android-7.1.2_r17..android-7.1.2_r24========= Image.gz-dtb | Bin 18643765 -> 18647444 bytes 1 file changed, 0 insertions(+), 0 deletions(-) fbab783 Merge cherrypicks of [2307556, 2307630, 2307631, 2307557, 2307632, 2307656, 2307743, 2307635, 2307799, 2307577, 2307800, 2307707, 2307803, 2307781, 2307773, 2307637, 2307804, 2307618, 2307734, 2307708, 2307805, 2307709, 2307806, 2307820, 2307746, 2307774, 2307839, 2307735, 2307782, 2307808, 2307840, 2307738, 2307783, 2307749, 2307775, 2307860, 2307899, 2307822, 2307823, 2307880, 2307778, 2307825, 2307882, 2307787, 2307919, 2307844, 2307905, 2307883, 2307829, 2307907, 2307832, 2307944, 2307945, 2307911] into nyc-mr2-pixel-monthly-release ========platform/external/boringssl between android-7.1.2_r17..android-7.1.2_r24========= src/crypto/asn1/a_d2i_fp.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) b1aad23 CVE 2016-2109 fix ========platform/external/dng_sdk between android-7.1.2_r17..android-7.1.2_r24========= source/dng_ifd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 35aa468 Throw exception on integer overflow in dng_ifd.cpp. ========platform/external/libavc between android-7.1.2_r17..android-7.1.2_r24========= decoder/ih264d_api.c | 9 ++++++--- decoder/ih264d_dpb_mgr.c | 4 +++- decoder/ih264d_parse_headers.c | 6 ++++-- decoder/ih264d_parse_islice.c | 17 ++++++++++++++--- decoder/ih264d_parse_pslice.c | 20 ++++++++++++++------ decoder/ih264d_parse_slice.c | 4 ---- decoder/ih264d_process_bslice.c | 4 ++-- decoder/ih264d_process_intra_mb.c | 12 +++++++++--- decoder/ih264d_utils.c | 1 + 9 files changed, 53 insertions(+), 24 deletions(-) 9490be3 Decoder: Fix end of bitstream error. 77af827 Decoder: Fix allocation for Mbaff weight matrix 776ddbc Decoder: Initialize MB info buffer to zero. 4081cc4 Decoder: Fixed flag u1_top_bottom_decoded. abb5cfb Decoder: Added an error check while parsing PPS. c2d3ce5 Fix stack buffer overflow in ih264d_process_intra_mb 76f6a3e Decoder: Fix in reference list initialization. d4b34e3 Decoder: Fixes in accessing mbaff flag in error cases 9759612 Fix in the case of MMCO 3 (long term reference idx). ========platform/external/libgdx between android-7.1.2_r17..android-7.1.2_r24========= gdx/jni/com.badlogic.gdx.graphics.glutils.ETC1.cpp | 29 ++++++++++-- gdx/jni/gdx2d/gdx2d.c | 21 ++++++++- gdx/jni/gdx2d/jpgd.cpp | 51 +++++++++++++++++----- gdx/jni/gdx2d/stb_image.h | 19 +++++++- 4 files changed, 104 insertions(+), 16 deletions(-) c97a2c14a Fix 36385715 heap overflow when loading HDR files 4702c5037 Fix Pixmap overflow. Bug 36621442 e3b5da5b3 Fix series of JPEG vulnerabilities e0ddaf09b Fix 36385715 heap overflow when loading HDR files ========platform/external/libhevc between android-7.1.2_r17..android-7.1.2_r24========= decoder/ihevcd_parse_headers.c | 61 ++++++++++++++++++++++++++++++++++--- decoder/ihevcd_parse_slice_header.c | 10 ++++-- 2 files changed, 63 insertions(+), 8 deletions(-) 6523680 Fix heap buffer overflow while searching for valid PPS cf376a7 Check for buffer overflow in pps/slice header parsing 62e944d memset SPS to zero d6fd3d7 Fix reallocation for new sps 011b658 DO NOT MERGE Handle streams with change in max_dec_buffering/num_reorder_frames without resolution change 4667b9e Check for cpb cnt in hrd parsing ========platform/external/libmpeg2 between android-7.1.2_r17..android-7.1.2_r24========= decoder/impeg2d_dec_hdr.c | 22 +++++++++++++++++++++- decoder/impeg2d_decoder.c | 28 +++++++++++++++++++++++++--- decoder/impeg2d_pic_proc.c | 26 ++++++++++++++++++++++++++ decoder/impeg2d_pnb_pic.c | 17 +++++++++++++++-- 4 files changed, 87 insertions(+), 6 deletions(-) b427732 Check Number of Skip MBs 5da05c0 Error Resilience - Check on as_recent_fld[0][1] 45df45d Fix Bytes Consumed Issue ========platform/external/skia between android-7.1.2_r17..android-7.1.2_r24========= resources/invalid_images/b34778578.bmp | Bin 0 -> 132 bytes src/codec/SkBmpCodec.cpp | 7 ++++--- tests/CodexTest.cpp | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) e60ff4c6f Set a limit on the size for BMP images DO NOT MERGE ========platform/external/sonivox between android-7.1.2_r17..android-7.1.2_r24========= arm-wt-22k/lib_src/eas_mdls.c | 5 +++++ arm-wt-22k/lib_src/eas_xmf.c | 7 +++++++ 2 files changed, 12 insertions(+) 63ff572 Fix infinite recursion 1f2842c Check chunk size ========platform/external/tremolo between android-7.1.2_r17..android-7.1.2_r24========= Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 7d1beba Always use unsigned char ========platform/frameworks/av between android-7.1.2_r17..android-7.1.2_r24========= media/libstagefright/MPEG4Extractor.cpp | 33 ++++++++++++----------- media/libstagefright/OggExtractor.cpp | 16 ++++++++++- media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp | 12 +++++++++ media/libstagefright/codecs/avcenc/SoftAVCEnc.h | 2 ++ media/libstagefright/omx/OMXNodeInstance.cpp | 18 +++++++++++++ 5 files changed, 64 insertions(+), 17 deletions(-) e0123f5f7 Modifying MetaData invalidates previous char* 309c4fbdf Fix memory leak in error case 77089b2d1 Limit ogg packet size aaeca869b Prevent OOB write in soft_avc encoder edc128668 Don't allow using or allocating a buffer after the first state transition ========platform/frameworks/base between android-7.1.2_r17..android-7.1.2_r24========= .../view/accessibility/AccessibilityNodeInfo.java | 23 +++++++++++----------- core/java/com/android/internal/os/ZygoteInit.java | 2 +- .../com/android/server/vr/VrManagerService.java | 6 +----- 3 files changed, 14 insertions(+), 17 deletions(-) 0d099dd190a ZygoteInit: Remove CAP_SYS_RESOURCE 6b7bffbe57d system_server: add CAP_SYS_PTRACE de7cc6b147e Fix re-enabling alert window appop after leaving VR mode. aa4edfe65d7 Make a11y node info parceling more robust ========platform/frameworks/native between android-7.1.2_r17..android-7.1.2_r24========= libs/gui/IGraphicBufferProducer.cpp | 9 +++++++++ libs/gui/Surface.cpp | 6 ++++++ libs/ui/Fence.cpp | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) 2210c72ec libgui: check for invalid slot in attachBuffer d3fa90b46 libgui: Check slot received from IGBP in Surface 9ab12528a ui: Fix bad size check in Fence::unflatten ========platform/libcore between android-7.1.2_r17..android-7.1.2_r24========= .../libcore/java/net/FtpURLConnectionTest.java | 85 ++++++++++++++++++++++ .../src/main/java/sun/net/ftp/impl/FtpClient.java | 19 ++++- 2 files changed, 100 insertions(+), 4 deletions(-) b85da16d5 Proper fix for rejecting ftp URL with /r/n. d1b3b2673 Test for rejection of ftp URL with /r/n in userinfo ========platform/packages/apps/Settings between android-7.1.2_r17..android-7.1.2_r24========= src/com/android/settings/ChooseLockGeneric.java | 15 +- .../settings/accounts/ManageAccountsSettings.java | 32 ++- tests/app/Android.mk | 4 +- .../android/settings/ChooseLockGenericTest.java | 235 +++++++++++++++++++++ 4 files changed, 262 insertions(+), 24 deletions(-) bd1cc323b4 Fix phishing attack in ChooseLockGeneric 97fd637a1d resolve merge conflicts of 3964c51bf2 to nyc-dev ========platform/packages/providers/DownloadProvider between android-7.1.2_r17..android-7.1.2_r24========= .../providers/downloads/DownloadProvider.java | 55 ++++++++++++++++++---- 1 file changed, 45 insertions(+), 10 deletions(-) a66dd88 DO NOT MERGE Deleting downloads for removed uids on downloadprovider start ========platform/packages/providers/MediaProvider between android-7.1.2_r17..android-7.1.2_r24========= src/com/android/providers/media/MediaProvider.java | 43 +++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) 67ef565 [DO NOT MERGE] Enforce user separation on external storage ========platform/system/sepolicy between android-7.1.2_r17..android-7.1.2_r24========= system_server.te | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 4cfc1b92f system_server: replace sys_resource with sys_ptrace