*************************************************************** *************************************************************** 56 file changed, 1335 insertions(+), 160 deletions(-) *************************************************************** *************************************************************** ========platform/build between android-7.1.0_r4..android-7.1.0_r7========= core/build_id.mk | 2 +- core/version_defaults.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) a9e6f6f NDE63X e683369 NDE63U 7ec1d2d NDE63T e228280 Clean up vendor image handling - DO NOT MERGE 6e7e185 NDE63S 92b2fac NDE63R ea5d153 Updating security string to 2016-11-05 on nyc-dev 560ccb0 Updating Security String to 2016-11-01 on nyc-dev 1dfff40 NDF12 58d48ba NDE63Q ========device/google/marlin-kernel between android-7.1.0_r4..android-7.1.0_r7========= Image.gz-dtb | Bin 18970449 -> 18894208 bytes 1 file changed, 0 insertions(+), 0 deletions(-) e857ed5 marlin: update prebuilt kernel [ DO NOT MERGE ANYWHERE ] ========platform/external/chromium-webview between android-7.1.0_r4..android-7.1.0_r7========= prebuilt/arm/webview.apk | Bin 29995246 -> 29995238 bytes prebuilt/arm64/webview.apk | Bin 54830090 -> 54830088 bytes prebuilt/mips/webview.apk | Bin 36002779 -> 36002783 bytes prebuilt/x86/webview.apk | Bin 33968578 -> 33968574 bytes prebuilt/x86_64/webview.apk | Bin 58761070 -> 58761042 bytes 5 files changed, 0 insertions(+), 0 deletions(-) 9c7ae2b resolve merge conflicts of e9d901a to nyc-dev ========platform/external/conscrypt between android-7.1.0_r4..android-7.1.0_r7========= src/main/native/org_conscrypt_NativeCrypto.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 68a82f6 Fix typo in name of des-ede mapping ========platform/external/expat between android-7.1.0_r4..android-7.1.0_r7========= lib/xmlparse.c | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) 5b5f716 Fix cast from pointer to integer of different size f74f2bf Security Vulnerability - CVE-2012-6702 and CVE-2016-5300 ========platform/external/libavc between android-7.1.0_r4..android-7.1.0_r7========= decoder/ih264d_api.c | 5 +++-- decoder/ih264d_inter_pred.c | 7 +++---- decoder/ih264d_parse_pslice.c | 24 +++++++++++++++++++++--- decoder/ih264d_parse_slice.c | 7 +++++++ 4 files changed, 34 insertions(+), 9 deletions(-) 8577253 Decoder: Fixes for handling errors in multi-slice MB Aff streams 8aba266 Fix in the case of invalid SPS PPS ========platform/external/sl4a between android-7.1.0_r4..android-7.1.0_r7========= f50992a [DO NOT MERGE ANYWHERE] Add functions for explicit control VT Settings ========platform/frameworks/av between android-7.1.0_r4..android-7.1.0_r7========= include/radio/Radio.h | 2 +- include/soundtrigger/SoundTrigger.h | 2 +- media/libeffects/visualizer/EffectVisualizer.cpp | 9 + media/libmedia/IDrm.cpp | 2 +- media/libmedia/IOMX.cpp | 52 +++--- media/libstagefright/MPEG4Extractor.cpp | 11 ++ media/libstagefright/SampleIterator.cpp | 7 +- media/libstagefright/http/MediaHTTP.cpp | 10 +- media/libstagefright/include/OMXNodeInstance.h | 6 + media/libstagefright/omx/OMXNodeInstance.cpp | 224 +++++++++++++++++++---- radio/Radio.cpp | 6 +- soundtrigger/SoundTrigger.cpp | 8 +- 12 files changed, 261 insertions(+), 78 deletions(-) a088de6 Limit mp4 atom size to something reasonable bf6f3aa SampleIterator: clear members on seekTo error efbe57e Check mprotect result a0555f5 IOMX: do not clear buffer if it's allocated by component 7352b65 OMXNodeInstance: sanity check portIndex. 6e5985f IOMX: allow configuration after going to loaded state 945bac9 Fix free-after-use for MediaHTTP 9deaa27 IOMX: do not convert ANWB to gralloc source in emptyBuffer 8947e99 Radio: get service by value. 7eae5b2 SoundTrigger: get service by value. 58ef1e9 Fix stack content leak vulnerability in mediaserver 11a565b Fix potential overflow in Visualizer effect c958a18 DO NOT MERGE: IOMX: work against metadata buffer spoofing ========platform/frameworks/base between android-7.1.0_r4..android-7.1.0_r7========= core/java/android/accounts/AccountManager.java | 4 - core/java/android/app/DownloadManager.java | 6 +- core/java/android/bluetooth/BluetoothDevice.java | 4 +- core/jni/android/graphics/Bitmap.cpp | 6 +- core/jni/android/graphics/Bitmap.h | 4 +- core/jni/android/graphics/Graphics.cpp | 9 +- core/jni/android/graphics/GraphicsJNI.h | 2 +- core/jni/com_android_internal_os_Zygote.cpp | 26 + core/jni/fd_utils-inl.h | 540 +++++++++++++++++++++ media/java/android/media/ExifInterface.java | 13 +- .../android/server/InputMethodManagerService.java | 4 +- .../server/accounts/AccountManagerService.java | 12 +- .../android/server/am/ActivityManagerService.java | 36 +- .../android/server/am/ActivityStackSupervisor.java | 79 ++- .../com/android/server/am/ActivityStarter.java | 5 + .../android/server/connectivity/PacManager.java | 36 +- .../android/server/media/MediaSessionService.java | 7 + .../devicepolicy/DevicePolicyManagerService.java | 7 + 18 files changed, 743 insertions(+), 57 deletions(-) 9a61895 Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi. 03d0f46 Slightly simplify IpManager#compareProvisioning. a205569 Conditionally accept loss of on-link IPv6 DNS servers cadd8e9 Refactor "avoid bad wifi" logic into a utility class 2d22d81 Continue if package is not in system 7078020 Rematch wifi networks when the avoid bad wifi setting changes. e6fb776 Add debug output for bad wifi avoidance restrictions. a21d687 Support "don't ask again" in the avoid bad wifi dialog. 964c76b Update the avoid bad wifi settings on the handler thread. 4110093 Disable network switching toasts on Verizon. 18fce9a Unit tests for avoid bad wifi networks setting. 6123f6d Support displaying a dialog when wifi becomes unvalidated. 1bfa4c5 Support ignoring penalty for bad wifi networks ce5bc7f Explicitly pass old score to updateCapabilities 8d4ca48 Change bang to x for indication of no internet 874ec8c Fixed a bug with incorrect handling of onUnlockUser 48ce97a Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 ad58c1c DO NOT MERGE Check caller for sending media key to global priority session d206d52 Fix build break due to automerge of 7d2198b5 c186ac5 Catch all exceptions when parsing IME meta data a4a346b Fix deadlock in AcitivityManagerService. 7b79e69 Only return password for account session flow if the caller is signed with system key and have get_password permission. 6be1713 Ensure munmap matches mmap cac4e4e Fix setPairingConfirmation permissions issue (2/2) 420ccbf DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change 9c20939 Backport changes to whitelist sockets opened by the zygote. e5387e1 DO NOT MERGE Stop work challenge freeform bypass 5756cb0 Use "all_downloads" instead of "my_downloads". ========platform/frameworks/opt/telephony between android-7.1.0_r4..android-7.1.0_r7========= ce344a7 Add stub of avoidUnvalidated() to ConnectivityServiceMock. c889225 Dispose pendingMO connection on phone type switch. ========platform/hardware/qcom/audio between android-7.1.0_r4..android-7.1.0_r7========= visualizer/offload_visualizer.c | 8 ++++++++ 1 file changed, 8 insertions(+) 6eca75d Fix potential overflow in Visualizer effect ========platform/packages/apps/Bluetooth between android-7.1.0_r4..android-7.1.0_r7========= .../bluetooth/btservice/AdapterService.java | 4 +- .../bluetooth/map/BluetoothMapContentObserver.java | 59 ++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) 2d03e3e Change MAP to send one new message event when encrypted storage is unlocked a3a09d2 Fix setPairingConfirmation permissions issue (1/2) ========platform/packages/apps/Launcher3 between android-7.1.0_r4..android-7.1.0_r7========= .../android/launcher3/InstallShortcutReceiver.java | 10 ++++ src/com/android/launcher3/Launcher.java | 19 +++++++- .../launcher3/util/PackageManagerHelper.java | 56 ++++++++++++++++++++++ 3 files changed, 83 insertions(+), 2 deletions(-) c2b630c Preventing a shortcut which requires permissions from being added to homescreen ========platform/packages/apps/Settings between android-7.1.0_r4..android-7.1.0_r7========= da8f345 Import translations. DO NOT MERGE 8caf412 Update text of wifi to cell autoswitch toggle be29a83 Import translations. DO NOT MERGE e2759d1 Import translations. DO NOT MERGE 7099cf4 Import translations. DO NOT MERGE b5f4595 Import translations. DO NOT MERGE 93e2917 Add a "Don't ask again" checkbox to the avoid bad wifi dialog. a8a9c10 Import translations. DO NOT MERGE e473aea Bad Wi-Fi: Change strings to carrier specs 3cedf83 Add a "Cellular data fallback" pref. 1be3441 Fix unintended modification of the NO_INTERNET dialog. 5f88ee9 Support displaying a dialog when Wi-Fi loses Internet access. ========platform/packages/providers/DownloadProvider between android-7.1.0_r4..android-7.1.0_r7========= .../providers/downloads/DownloadProvider.java | 45 +++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) ceec8c3 Enforce calling identity before clearing. ========platform/packages/services/Telephony between android-7.1.0_r4..android-7.1.0_r7========= 45e0fc2 Cleanup Connections in conference controllers on CDMA<-->GSM change. ========platform/system/core between android-7.1.0_r4..android-7.1.0_r7========= include/android/log.h | 5 +++++ liblog/logger_write.c | 35 +++++++++++++++++++++++++++++++++++ liblog/tests/liblog_test.cpp | 10 +++++++++- 3 files changed, 49 insertions(+), 1 deletion(-) dfca6cd Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGE 0982640 liblog: add __android_log_close() ========platform/system/media between android-7.1.0_r4..android-7.1.0_r7========= audio_effects/include/audio_effects/effect_visualizer.h | 1 + 1 file changed, 1 insertion(+) c098dd1 Fix potential overflow in Visualizer effect ========platform/system/sepolicy between android-7.1.0_r4..android-7.1.0_r7========= zygote.te | 6 ++++++ 1 file changed, 6 insertions(+) 6b1268f Allow the zygote to stat all files it opens.