*************************************************************** *************************************************************** 57 file changed, 348 insertions(+), 373 deletions(-) *************************************************************** *************************************************************** ========platform/build between android-7.1.2_r11..android-7.1.2_r17========= core/build_id.mk | 2 +- core/version_defaults.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) a34a38bc0 Version bump to NJH47B 53ddb2a71 Version bump to NJH34C 798a617df [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev 64eb92526 [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev 91a67a127 N2G47W cf99a68cb Version bump to NJH21D 56ac9dbe5 [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev 98eb156a3 [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev 43e44060e [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev d2daf116b N2G47V 63b920f89 [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev 3dad5c6bd [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev c68500f10 N2G47U 828d4f8e9 N2G47T cee5f073c N2G47S 189e63df8 N2G47R 765dc24b5 N2G47Q 47991dfb1 N2G47P 72c9cf9ea N2G47O 5bc868310 N2G47N 5847a7554 N2G47M 374437df5 N2G47L 5021e99eb N2G47K b90009498 Update Security String to 2017-05-05 on nyc-dev e3025b9ec Update Security String to 2017-05-01 on nyc-dev ========device/asus/fugu-kernel between android-7.1.2_r11..android-7.1.2_r17========= bzImage | Bin 5388736 -> 5388176 bytes 1 file changed, 0 insertions(+), 0 deletions(-) cafa66d release-request-513a9883-0d18-4c2f-80ce-cadb234b4e89-for-git_nyc-mr2-pixel-monthly-release-3938523 snap-temp-L39300000065258774 ========device/google/dragon-kernel between android-7.1.2_r11..android-7.1.2_r17========= Image.fit | Bin 7777108 -> 7776256 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 708840c release-request-513a9883-0d18-4c2f-80ce-cadb234b4e89-for-git_nyc-mr2-pixel-monthly-release-3938523 snap-temp-L39300000065258774 ========device/google/marlin between android-7.1.2_r11..android-7.1.2_r17========= apns-full-conf.xml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) 6223abb4 DTAG: Use hos apn for supl with bearer 18 6fe3c697 DTAT: Combine internet.telekom apn. ========device/google/marlin-kernel between android-7.1.2_r11..android-7.1.2_r17========= Image.gz-dtb | Bin 18643740 -> 18643765 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 80ef980 Merge cherrypicks of [2278225, 2279882, 2279862, 2278226, 2277057, 2279863, 2278227] into nyc-mr2-pixel-monthly-release ========device/huawei/angler between android-7.1.2_r11..android-7.1.2_r17========= e0a57bd angler: thermal: limit cpu and gpu core temperature ========device/huawei/angler-kernel between android-7.1.2_r11..android-7.1.2_r17========= Image.gz-dtb | Bin 11157903 -> 11160087 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 1d3fb17 release-request-513a9883-0d18-4c2f-80ce-cadb234b4e89-for-git_nyc-mr2-pixel-monthly-release-3938523 snap-temp-L39300000065258774 ========device/lge/bullhead-kernel between android-7.1.2_r11..android-7.1.2_r17========= Image.gz-dtb | Bin 10817210 -> 10818319 bytes 1 file changed, 0 insertions(+), 0 deletions(-) f9dee28 release-request-513a9883-0d18-4c2f-80ce-cadb234b4e89-for-git_nyc-mr2-pixel-monthly-release-3938523 snap-temp-L39300000065258774 ========platform/external/boringssl between android-7.1.2_r11..android-7.1.2_r17========= 13179a8 Always use Fermat's Little Theorem in ecdsa_sign_setup. ========platform/external/giflib between android-7.1.2_r11..android-7.1.2_r17========= dc07290 Update GIFLIB to 5.1.4 DO NOT MERGE ========platform/external/libavc between android-7.1.2_r11..android-7.1.2_r17========= 5c3fd5d Decoder: Fixed error handling for dangling fields ========platform/external/libgdx between android-7.1.2_r11..android-7.1.2_r17========= gdx/jni/gdx2d/stb_image.h | 8 ++++++++ 1 file changed, 8 insertions(+) 113553341 Fix heap overflow when loading a PSD. bug 36368305 a3b3f7467 Fix heap overflow when loading a PSD. bug 36368305 ========platform/external/libhevc between android-7.1.2_r11..android-7.1.2_r17========= decoder/ihevcd_parse_headers.c | 10 ++++++++-- decoder/ihevcd_parse_slice_header.c | 10 +++++++--- decoder/ihevcd_ref_list.c | 6 +++--- decoder/ihevcd_structs.h | 3 +++ decoder/ihevcd_utils.c | 2 ++ 5 files changed, 23 insertions(+), 8 deletions(-) 9d0b579 Correct Tiles rows and cols check 5e35abd Check only allocated mv bufs for releasing from reference 8851805 Set current slice ctb x and y to fill prev incomplete slice 3d8d296 Correct Tiles rows and cols check a100ab9 Check only allocated mv bufs for releasing from reference cd22e2c Set current slice ctb x and y to fill prev incomplete slice bcfc712 Return error from cabac init if offset is greater than range a142472 Handle error return from ref list in slice hdr parsing 45c97f8 Return error if SPS parsing reads more bytes than the nal length ========platform/external/libmpeg2 between android-7.1.2_r11..android-7.1.2_r17========= a86eb79 Fix in handling header decode errors ========platform/external/libvpx between android-7.1.2_r11..android-7.1.2_r17========= config/arm-neon/vpx_config.asm | 2 +- config/arm-neon/vpx_config.c | 2 +- config/arm-neon/vpx_config.h | 4 +++- config/arm/vpx_config.asm | 2 +- config/arm/vpx_config.c | 2 +- config/arm/vpx_config.h | 4 +++- config/arm64/vpx_config.asm | 2 +- config/arm64/vpx_config.c | 2 +- config/arm64/vpx_config.h | 4 +++- config/generic/vpx_config.asm | 2 +- config/generic/vpx_config.c | 2 +- config/generic/vpx_config.h | 4 +++- config/mips32-dspr2/vpx_config.c | 2 +- config/mips32-dspr2/vpx_config.h | 4 +++- config/mips32/vpx_config.c | 2 +- config/mips32/vpx_config.h | 4 +++- config/mips64/vpx_config.c | 2 +- config/mips64/vpx_config.h | 4 +++- config/x86/vpx_config.asm | 2 +- config/x86/vpx_config.c | 2 +- config/x86/vpx_config.h | 4 +++- config/x86_64/vpx_config.asm | 2 +- config/x86_64/vpx_config.c | 2 +- config/x86_64/vpx_config.h | 4 +++- generate_config.sh | 2 +- 25 files changed, 43 insertions(+), 25 deletions(-) c2f8373 Limit vpx decoder to 4K frames 66892a9 Limit vpx decoder to 4K frames ========platform/external/libxml2 between android-7.1.2_r11..android-7.1.2_r17========= parser.c | 17 +++- test/XPath/xptr/vidbase | 1 + uri.c | 3 +- valid.c | 4 +- xpath.c | 9 +- xpointer.c | 225 +++++++++++++----------------------------------- 6 files changed, 90 insertions(+), 169 deletions(-) 6a2e63db DO NOT MERGE: Disallow namespace nodes in XPointer ranges 39ef221a DO NOT MERGE: Add validation for eternal enities c48bd300 DO NOT MERGE: Fix XPointer paths beginning with range-to 4f0685a9 DO NOT MERGE: Use correct limit for port values a0b742c4 DO NOT MERGE: Heap buffer overflow in xmlAddID 87b8586b DO NOT MERGE: fix for the XPath nodeTab use-after-free bug from nmehta@ 508faa0f DO NOT MERGE: Apply upstream Chromium patch for encoding changes db3d77a0 DO NOT MERGE: Heap buffer overflow in xmlAddID d0e0d765 DO NOT MERGE: fix for the XPath nodeTab use-after-free bug from nmehta@ 0d47c4cb DO NOT MERGE: Apply upstream Chromium patch for encoding changes c93a8956 DO NOT MERGE: Disallow namespace nodes in XPointer ranges 233cf5cd DO NOT MERGE: Use correct limit for port values 58e494f4 DO NOT MERGE: Add validation for eternal enities 66212ee0 DO NOT MERGE: Fix XPointer paths beginning with range-to ========platform/frameworks/av between android-7.1.2_r11..android-7.1.2_r17========= 594bf9343 Add bounds check in SoftAACEncoder2::onQueueFilled() 961e5ac57 Fix NPDs in h263 decoder 6f1d990ce Fix out of bounds access 36b04932b Fix integer overflow and divide-by-zero 523f6b49c Validate lengths in HEVC metadata parsing a9188f891 AudioFlinger: Check framecount overflow when creating track ========platform/frameworks/base between android-7.1.2_r11..android-7.1.2_r17========= core/tests/coretests/src/android/os/BinderThreadPriorityTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) b716a255171 Remove bg_non_interactive cgroup [ DO NOT MERGE ] cd248ac7ba3 Remove bg_non_interactive cgroup [ DO NOT MERGE ] a09cb5d47a3 Remove bg_non_interactive cgroup [ DO NOT MERGE ] 1a5fdccc6d1 Remove bg_non_interactive cgroup [ DO NOT MERGE ] 78efbc95412 [DO NOT MERGE] Don't allow permission change to runtime d42e1204d5d [DO NOT MERGE] Throw exception if slot has invalid offset 4e110ab20bb [DO NOT MERGE] Check bounds in offsetToPtr 542bba3f357 Fix issue with saving admins before finishing loading. f806d65e615 resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev fix conflict in nyc-mr2-release Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0 667d2cbe3eb Protect Bluetooth OPP ACCEPT and DECLINE broadcast ========platform/frameworks/native between android-7.1.2_r11..android-7.1.2_r17========= include/binder/IPCThreadState.h | 1 - libs/binder/IPCThreadState.cpp | 162 ++++++++++++++++------------------------ 2 files changed, 64 insertions(+), 99 deletions(-) d01fe0a25 binder: remove cgroup interactions [ DO NOT MERGE ] 4fb338663 binder: remove cgroup interactions [ DO NOT MERGE ] a7dbb27e3 binder: remove cgroup interactions [ DO NOT MERGE ] 11a692ca2 binder: remove cgroup interactions [ DO NOT MERGE ] ========platform/libcore between android-7.1.2_r11..android-7.1.2_r17========= 92a7b90bc Reject ftp URLConnection containing /r/n in user info. 7ef1f06cb Test for rejection of ftp URL with /r/n in userinfo ========platform/packages/apps/Bluetooth between android-7.1.2_r11..android-7.1.2_r17========= .../opp/BluetoothOppHandoverReceiver.java | 2 +- .../opp/BluetoothOppLauncherActivity.java | 9 ++-- .../android/bluetooth/opp/BluetoothOppManager.java | 16 +++--- .../bluetooth/opp/BluetoothOppSendFileInfo.java | 15 +++++- .../android/bluetooth/opp/BluetoothOppUtility.java | 58 ++++++++++++++++++---- 5 files changed, 78 insertions(+), 22 deletions(-) 877e9be29 Prevent OPP from opening files that aren't sent over Bluetooth ad46f6a52 OPP: Restrict file based URI access to external storage 8175764fd Prevent OPP from opening files that aren't sent over Bluetooth 0ed24c45e OPP: Restrict file based URI access to external storage ========platform/system/bt between android-7.1.2_r11..android-7.1.2_r17========= stack/btm/btm_ble_gap.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 0bbd5c6a Check LE advertising data length before caching advertising records 9421015f Check LE advertising data length before caching advertising records a4875a49 resolve merge conflicts of a3ee2e35 to nyc-dev ========platform/system/core between android-7.1.2_r11..android-7.1.2_r17========= libcutils/sched_policy.c | 32 +++----------------------------- libziparchive/zip_archive.cc | 13 ++++++++----- rootdir/init.rc | 9 --------- 3 files changed, 11 insertions(+), 43 deletions(-) 31f78ddf4 libcutils: remove schedgroup fds [DO NOT MERGE] f388babd5 init.rc: remove bg_non_interactive cgroup [ DO NOT MERGE ] 783a787da libcutils: only change cgroup when fd is initialized [ DO NOT MERGE ] 278ee6b9f libcutils: remove schedgroup fds [DO NOT MERGE] 2997bad1a libcutils: remove schedgroup fds [DO NOT MERGE] d3f10b9de libcutils: remove schedgroup fds [DO NOT MERGE] 2dec62801 Fix out of bound read in libziparchive 6617398c2 libcutils: only change cgroup when fd is initialized [ DO NOT MERGE ] 1dbaa1717 init.rc: remove bg_non_interactive cgroup [ DO NOT MERGE ] fd1574b91 Fix out of bound read in libziparchive ba75641d6 init.rc: remove bg_non_interactive cgroup [ DO NOT MERGE ] e0b4eadc3 libcutils: only change cgroup when fd is initialized [ DO NOT MERGE ] 3d6a43155 Fix out of bound read in libziparchive 941815746 libcutils: remove schedgroup fds [DO NOT MERGE] e6e89f99d libcutils: only change cgroup when fd is initialized [ DO NOT MERGE ] 73c917f3e init.rc: remove bg_non_interactive cgroup [ DO NOT MERGE ]