*************************************************************** *************************************************************** 39 file changed, 555 insertions(+), 207 deletions(-) *************************************************************** *************************************************************** ========platform/build between android-7.1.1_r6..android-7.1.1_r12========= core/build_id.mk | 2 +- core/version_defaults.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 76387e5 N4F26M a1cb7f0 Security String to Jan 1 3ea5395 N4F26L 080f689 Revert Security String to December 7aa1ac0 N4F26K 2e3a78a Revert Security String to December cbd7bcd N4F26J ddb968c N4F26I 9df1107 Updating Security String to 2017-01-05 on nyc-dev 1716c8e Updating Security String to 2017-01-01 on nyc-dev f182508 N4F26H ========device/google/dragon-kernel between android-7.1.1_r6..android-7.1.1_r12========= Image.fit | Bin 7704904 -> 7704552 bytes 1 file changed, 0 insertions(+), 0 deletions(-) c24e583 ryu: update prebuilt kernel [ DO NOT MERGE ] ========device/google/marlin-kernel between android-7.1.1_r6..android-7.1.1_r12========= Image.gz-dtb | Bin 18706953 -> 18707201 bytes 1 file changed, 0 insertions(+), 0 deletions(-) a604d27 marlin: update prebuilt kernel [ DO NOT MERGE ] ========device/htc/flounder-kernel between android-7.1.1_r6..android-7.1.1_r12========= fb053e6 Revert "flounder: update kernel prebuild (Jan 2017 NYC-MR1 Security)" ========device/huawei/angler-kernel between android-7.1.1_r6..android-7.1.1_r12========= Image.gz-dtb | Bin 11175493 -> 11176088 bytes 1 file changed, 0 insertions(+), 0 deletions(-) a57b9fa angler: update prebuilt kernel [ DO NOT MERGE ANYWHERE ] ========device/lge/bullhead-kernel between android-7.1.1_r6..android-7.1.1_r12========= Image.gz-dtb | Bin 10834933 -> 10841255 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 0c9a7c4 bullhead: update prebuilt kernel [ DO NOT MERGE ANYWHERE ] ========platform/external/libhevc between android-7.1.1_r6..android-7.1.1_r12========= decoder/ihevcd_decode.c | 1 + 1 file changed, 1 insertion(+) a15d536 Handle invalid slice_address in slice header ========platform/external/libnl between android-7.1.1_r6..android-7.1.1_r12========= lib/attr.c | 6 ++++++ 1 file changed, 6 insertions(+) 7dd2dbd libnl: Check data length in nla_reserve / nla_put ========platform/external/libopus between android-7.1.1_r6..android-7.1.1_r12========= silk/NLSF_stabilize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 9eff1d5 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_r12========= 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(-) 0603d0c vp8:fix threading issues ========platform/external/tremolo between android-7.1.1_r6..android-7.1.1_r12========= Tremolo/dpen.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) b61055f Tremolo: fix ARM assembly code for decode_map type 3 case ========platform/frameworks/av between android-7.1.1_r6..android-7.1.1_r12========= .../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(-) 20cd1ea Fix security vulnerability: Effect command might allow negative indexes 16e7fa2 Make VBRISeeker more robust a1712f7 Effects: Check get parameter command size cfc7e9a DO NOT MERGE: defensive parsing of mp3 album art information b57c79b Fix security vulnerability: Equalizer command might allow negative indexes 12ac1ae stagefright: remove allottedSize equality check in IOMX::useBuffer 6e6e992 Visualizer: Check capture size and latency parameters ========platform/frameworks/base between android-7.1.1_r6..android-7.1.1_r12========= .../policy/EmergencyAffordanceManager.java | 3 +- 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 +- services/net/java/android/net/dhcp/DhcpClient.java | 8 ++++ 6 files changed, 83 insertions(+), 6 deletions(-) badbe4e Zygote : Block SIGCHLD during fork. 79a52bb Fix idmap leak in zygote process 9b2c33c Zygote: Additional whitelisting for legacy devices. 2b074fa Zygote: Additional whitelists for runtime overlay / other static resources. d9f38b1 Public volumes belong to a single user. 20626d4 Add SafetyNet logging to DHCP packet parsing ec7bb1d Reject DHCP packets with no magic cookie 1af48bb Catch runtime exceptions when parsing DHCP packets ========platform/frameworks/ex between android-7.1.1_r6..android-7.1.1_r12========= framesequence/jni/FrameSequence_webp.cpp | 12 ++++++++++-- framesequence/jni/FrameSequence_webp.h | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) 854f11a resolve merge conflicts of 3802db4 to mnc-dev ========platform/frameworks/native between android-7.1.1_r6..android-7.1.1_r12========= include/binder/Parcel.h | 8 ++++++++ libs/gui/BufferQueueConsumer.cpp | 1 + 2 files changed, 9 insertions(+) cb7eff6 Fix SF security vulnerability: 32660278 8163b88 Fix integer overflow in unsafeReadTypedVector ========platform/hardware/qcom/audio between android-7.1.1_r6..android-7.1.1_r12========= post_proc/equalizer.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) 51e4565 Fix security vulnerability: Effect command might allow negative indexes 74f4b13 Fix security vulnerability: Equalizer command might allow negative indexes ========platform/packages/apps/ContactsCommon between android-7.1.1_r6..android-7.1.1_r12========= 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(-) bb07eb5 resolve merge conflicts of 9f523b4 to nyc-dev ========platform/packages/services/Telephony between android-7.1.1_r6..android-7.1.1_r12========= .../com/android/services/telephony/sip/SipConnection.java | 13 +++++++++++++ src/com/android/phone/CarrierConfigLoader.java | 9 ++------- 2 files changed, 15 insertions(+), 7 deletions(-) dda466a Catch SIP exceptions which can crash Phone process on answer.