*************************************************************** *************************************************************** 37 file changed, 563 insertions(+), 198 deletions(-) *************************************************************** *************************************************************** ========platform/build between android-7.1.1_r6..android-7.1.1_r13========= core/build_id.mk | 2 +- core/version_defaults.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) cf7e2da N6F26Q a618563 Updating Security String to 2017-01-05 on nyc-dev 1a90283 Updating Security String to 2017-01-01 on nyc-dev ========device/asus/fugu-kernel between android-7.1.1_r6..android-7.1.1_r13========= bzImage | Bin 5250672 -> 5386880 bytes 1 file changed, 0 insertions(+), 0 deletions(-) f4ee1db merge in nyc-mr1-security-b-release history after reset to nyc-mr1-release ========device/google/marlin-kernel between android-7.1.1_r6..android-7.1.1_r13========= Image.gz-dtb | Bin 18706953 -> 18708374 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 76704b1 merge in nyc-mr1-security-b-release history after reset to nyc-mr1-release ========device/moto/shamu-kernel between android-7.1.1_r6..android-7.1.1_r13========= zImage-dtb | Bin 7215207 -> 7215487 bytes 1 file changed, 0 insertions(+), 0 deletions(-) ad8ee49 shamu: update prebuilt kernel [ DO NOT MERGE ] ========platform/external/libhevc between android-7.1.1_r6..android-7.1.1_r13========= decoder/ihevcd_decode.c | 1 + 1 file changed, 1 insertion(+) b25d141 Handle invalid slice_address in slice header ========platform/external/libnl between android-7.1.1_r6..android-7.1.1_r13========= lib/attr.c | 6 ++++++ 1 file changed, 6 insertions(+) 77a7bed libnl: Check data length in nla_reserve / nla_put ========platform/external/libopus between android-7.1.1_r6..android-7.1.1_r13========= silk/NLSF_stabilize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 1ad8009 Ensure that NLSF cannot be negative when computing a min distance between them ========platform/external/libvpx between android-7.1.1_r6..android-7.1.1_r13========= libvpx/vp8/decoder/decodeframe.c | 10 ++- libvpx/vp8/decoder/onyxd_if.c | 3 - libvpx/vp8/decoder/threading.c | 183 ++++++++++++++++++--------------------- 3 files changed, 89 insertions(+), 107 deletions(-) 145f317 vp8:fix threading issues ========platform/external/tremolo between android-7.1.1_r6..android-7.1.1_r13========= Tremolo/dpen.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) a4327f0 Tremolo: fix ARM assembly code for decode_map type 3 case ========platform/frameworks/av between android-7.1.1_r6..android-7.1.1_r13========= .../libeffects/lvm/wrapper/Bundle/EffectBundle.cpp | 32 ++++++++++--- media/libeffects/visualizer/EffectVisualizer.cpp | 43 ++++++++++++----- media/libstagefright/VBRISeeker.cpp | 18 ++++++- media/libstagefright/id3/ID3.cpp | 56 +++++++++++++++------- media/libstagefright/omx/OMXNodeInstance.cpp | 7 --- services/audioflinger/Effects.cpp | 7 +++ 6 files changed, 120 insertions(+), 43 deletions(-) e684672 Fix security vulnerability: Effect command might allow negative indexes 4adf91c Make VBRISeeker more robust 70b95dd Effects: Check get parameter command size cdd16c8 DO NOT MERGE: defensive parsing of mp3 album art information adb8603 Fix security vulnerability: Equalizer command might allow negative indexes a09eaa0 stagefright: remove allottedSize equality check in IOMX::useBuffer 0e1e9f4 Visualizer: Check capture size and latency parameters ========platform/frameworks/base between android-7.1.1_r6..android-7.1.1_r13========= core/jni/com_android_internal_os_Zygote.cpp | 24 +++++++++++ core/jni/fd_utils-inl.h | 50 ++++++++++++++++++++-- libs/androidfw/AssetManager.cpp | 1 + .../externalstorage/ExternalStorageProvider.java | 3 +- .../com/android/server/LockSettingsService.java | 11 +++++ services/net/java/android/net/dhcp/DhcpClient.java | 8 ++++ 6 files changed, 93 insertions(+), 4 deletions(-) faf904b Zygote : Block SIGCHLD during fork. c4b8272 Fix idmap leak in zygote process 7f0c2c8 Zygote: Additional whitelisting for legacy devices. f522425 Zygote: Additional whitelists for runtime overlay / other static resources. def0efd Public volumes belong to a single user. 25ddf85 Add SafetyNet logging to DHCP packet parsing ec129c3 Reject DHCP packets with no magic cookie c28117b Catch runtime exceptions when parsing DHCP packets ========platform/frameworks/ex between android-7.1.1_r6..android-7.1.1_r13========= framesequence/jni/FrameSequence_webp.cpp | 12 ++++++++++-- framesequence/jni/FrameSequence_webp.h | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) 30ee0df resolve merge conflicts of 3802db4 to mnc-dev ========platform/frameworks/native between android-7.1.1_r6..android-7.1.1_r13========= include/binder/Parcel.h | 8 ++++++++ libs/gui/BufferQueueConsumer.cpp | 1 + 2 files changed, 9 insertions(+) 38ac668 Fix SF security vulnerability: 32660278 9a8df9a Fix integer overflow in unsafeReadTypedVector ========platform/hardware/qcom/audio between android-7.1.1_r6..android-7.1.1_r13========= post_proc/equalizer.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) 7e12c89 Fix security vulnerability: Effect command might allow negative indexes a0bfcdb Fix security vulnerability: Equalizer command might allow negative indexes ========platform/packages/apps/ContactsCommon between android-7.1.1_r6..android-7.1.1_r13========= res/values/strings.xml | 3 + .../RequestImportVCardPermissionsActivity.java | 6 +- .../activity/RequestPermissionsActivity.java | 6 +- .../activity/RequestPermissionsActivityBase.java | 14 ++++ .../contacts/common/util/AccountSelectionUtil.java | 45 +++++------ .../contacts/common/vcard/ImportVCardActivity.java | 43 +++++++++- .../common/vcard/ImportVCardDialogFragment.java | 91 ++++++++++++++++++++++ 7 files changed, 179 insertions(+), 29 deletions(-) 80822d7 resolve merge conflicts of 9f523b4 to nyc-dev ========platform/packages/services/Telephony between android-7.1.1_r6..android-7.1.1_r13========= .../com/android/services/telephony/sip/SipConnection.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) 38b45bb Catch SIP exceptions which can crash Phone process on answer.