*************************************************************** *************************************************************** 38 file changed, 342 insertions(+), 110 deletions(-) *************************************************************** *************************************************************** ========platform/build between android-7.1.2_r6..android-7.1.2_r10========= core/build_id.mk | 2 +- core/version_defaults.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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_r6..android-7.1.2_r10========= bzImage | Bin 5388736 -> 5388144 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 1c416e3 merge in nyc-mr2-release history after reset to nyc-mr2-dev ========device/google/dragon-kernel between android-7.1.2_r6..android-7.1.2_r10========= Image.fit | Bin 7777108 -> 7776336 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 4f8ec00 merge in nyc-mr2-release history after reset to 71ab439e8cc6c9ce06e50df123f35c968e8980f3 ========device/google/marlin between android-7.1.2_r6..android-7.1.2_r10========= 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_r6..android-7.1.2_r10========= Image.gz-dtb | Bin 18641295 -> 18643740 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 913f99e merge in nyc-mr2-release history after reset to ad00cbcf938478ba990e66a5fa4532fcca7be485 ========device/huawei/angler between android-7.1.2_r6..android-7.1.2_r10========= e0a57bd angler: thermal: limit cpu and gpu core temperature ========device/huawei/angler-kernel between android-7.1.2_r6..android-7.1.2_r10========= Image.gz-dtb | Bin 11157903 -> 11161192 bytes 1 file changed, 0 insertions(+), 0 deletions(-) f8f460b merge in nyc-mr2-release history after reset to 9e5ad790a30459c46fbe54dc6d7bda1355878f5e ========device/lge/bullhead-kernel between android-7.1.2_r6..android-7.1.2_r10========= Image.gz-dtb | Bin 10817210 -> 10818158 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 920ae82 merge in nyc-mr2-release history after reset to 865d00b18ed9ec7745627b595ccde47dc9b44e0f ========platform/external/boringssl between android-7.1.2_r6..android-7.1.2_r10========= src/crypto/ec/ec.c | 6 ++++++ src/crypto/ecdsa/ecdsa.c | 36 ++++++++++++++---------------------- 2 files changed, 20 insertions(+), 22 deletions(-) 13179a8 Always use Fermat's Little Theorem in ecdsa_sign_setup. ========platform/external/giflib between android-7.1.2_r6..android-7.1.2_r10========= Android.mk | 1 + dgif_lib.c | 26 ++++++++++++++++++++----- egif_lib.c | 4 ++++ gif_font.c | 51 ++++++++++++++++++++++++++++---------------------- gif_lib.h | 5 ++++- gifalloc.c | 27 +++++++++++++------------- openbsd-reallocarray.c | 39 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 112 insertions(+), 41 deletions(-) dc07290 Update GIFLIB to 5.1.4 DO NOT MERGE ========platform/external/libavc between android-7.1.2_r6..android-7.1.2_r10========= decoder/ih264d_utils.c | 1 - 1 file changed, 1 deletion(-) 5c3fd5d Decoder: Fixed error handling for dangling fields ========platform/external/libhevc between android-7.1.2_r6..android-7.1.2_r10========= decoder/ihevcd_cabac.c | 9 +++++ decoder/ihevcd_parse_headers.c | 4 +++ decoder/ihevcd_parse_slice.c | 67 ++++++++++++++++++++++++++----------- decoder/ihevcd_parse_slice_header.c | 6 +++- 4 files changed, 65 insertions(+), 21 deletions(-) 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_r6..android-7.1.2_r10========= decoder/impeg2d_api_main.c | 3 ++- decoder/impeg2d_dec_hdr.c | 4 +++- decoder/impeg2d_decoder.c | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) a86eb79 Fix in handling header decode errors ========platform/frameworks/av between android-7.1.2_r6..android-7.1.2_r10========= media/libstagefright/AMRExtractor.cpp | 2 +- media/libstagefright/HevcUtils.cpp | 16 ++++++++++++++++ media/libstagefright/NuMediaExtractor.cpp | 2 +- media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp | 9 +++++++++ .../codecs/m4v_h263/dec/src/mb_motion_comp.cpp | 18 +++++++++++++++++- .../codecs/m4v_h263/dec/src/pvdec_api.cpp | 7 +++++++ media/libstagefright/id3/ID3.cpp | 12 ++++++++---- services/audioflinger/Tracks.cpp | 17 ++++++++++++++++- 8 files changed, 75 insertions(+), 8 deletions(-) 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_r6..android-7.1.2_r10========= core/jni/android_database_CursorWindow.cpp | 8 ++++++++ core/res/AndroidManifest.xml | 2 ++ include/androidfw/CursorWindow.h | 17 ++++++++++++++--- libs/androidfw/CursorWindow.cpp | 5 +++++ .../com/android/server/pm/PackageManagerService.java | 14 ++++++++++++++ 5 files changed, 43 insertions(+), 3 deletions(-) 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_r6..android-7.1.2_r10========= 11a692ca2 binder: remove cgroup interactions [ DO NOT MERGE ] ========platform/system/bt between android-7.1.2_r6..android-7.1.2_r10========= stack/l2cap/l2c_main.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) a4875a49 resolve merge conflicts of a3ee2e35 to nyc-dev ========platform/system/core between android-7.1.2_r6..android-7.1.2_r10========= 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 ]