*************************************************************** *************************************************************** 42 file changed, 373 insertions(+), 58 deletions(-) *************************************************************** *************************************************************** ========platform/build between android-6.0.1_r55..android-6.0.1_r63========= core/build_id.mk | 2 +- core/main.mk | 1 + core/version_defaults.mk | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) 18e20c2 "MXC89L" 46c074d disable unpriv perf by default in user{,debug} builds b3e938a Updating security string to 2016-08-05 - directly to mnc-mr2-release ========device/google/dragon-kernel between android-6.0.1_r55..android-6.0.1_r63========= Image.fit | Bin 7629064 -> 7774236 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 6c5717e ryu: update prebuilt kernel ========platform/external/conscrypt between android-6.0.1_r55..android-6.0.1_r63========= src/main/java/org/conscrypt/NativeCrypto.java | 2 ++ src/main/java/org/conscrypt/SSLParametersImpl.java | 3 +-- src/main/native/org_conscrypt_NativeCrypto.cpp | 13 +++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) 120175c Use SSL_session_reused to check when a session was reused ========platform/external/jhead between android-6.0.1_r55..android-6.0.1_r63========= exif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 9cbb652 Fix possible out of bounds access ========platform/external/libavc between android-6.0.1_r55..android-6.0.1_r63========= decoder/ih264d_api.c | 9 +++++++-- decoder/ih264d_parse_headers.c | 6 ++++++ decoder/ih264d_parse_pslice.c | 5 ++++- decoder/ih264d_parse_slice.c | 7 ++++--- 4 files changed, 21 insertions(+), 6 deletions(-) 116309d Decoder: Initialize first_pb_nal_in_pic for error slices 666e3b9 Decoder: Fix slice number increment for error clips 919b19c Decoder: Do not conceal slices with invalid SPS/PPS ========platform/external/sepolicy between android-6.0.1_r55..android-6.0.1_r63========= property_contexts | 1 + 1 file changed, 1 insertion(+) 34b6e1b expose control over unpriv perf access to shell ========platform/frameworks/av between android-6.0.1_r55..android-6.0.1_r63========= camera/ICameraRecordingProxy.cpp | 6 +- include/camera/ICameraRecordingProxy.h | 6 ++ include/media/IMediaDeathNotifier.h | 2 +- include/media/stagefright/CameraSource.h | 3 + media/libmedia/IMediaDeathNotifier.cpp | 2 +- media/libmedia/mediaplayer.cpp | 6 +- media/libmedia/mediarecorder.cpp | 2 +- media/libstagefright/CameraSource.cpp | 29 +++++++++ media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 15 +++-- media/libstagefright/codecs/hevcdec/SoftHEVC.cpp | 22 +++++++ .../codecs/on2/h264dec/source/h264bsd_dpb.c | 8 +++ media/libstagefright/include/OMXNodeInstance.h | 2 +- media/libstagefright/omx/OMXNodeInstance.cpp | 73 ++++++++++++++++------ services/audioflinger/Effects.cpp | 6 ++ .../api1/client2/StreamingProcessor.cpp | 8 +++ 15 files changed, 157 insertions(+), 33 deletions(-) 1008830 Check effect command reply size in AudioFlinger 5ad443e DO NOT MERGE omx: check buffer port before using f8797d9 Fix potential overflow 855a538 SoftHEVC: Exit gracefully in case of decoder errors 98a875b Don't use sp<>& 63a8f18 SoftAAC2: fix crash on all-zero adts buffer 542bb74 DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak ========platform/frameworks/base between android-6.0.1_r55..android-6.0.1_r63========= cmds/pm/src/com/android/commands/pm/Pm.java | 36 ++++++++++ core/res/AndroidManifest.xml | 8 +++ .../src/com/android/keyguard/EmergencyButton.java | 10 +++ packages/Shell/AndroidManifest.xml | 2 +- .../android/server/am/ActivityManagerService.java | 5 ++ .../android/server/am/ActivityStackSupervisor.java | 4 +- .../com/android/server/pm/UserManagerService.java | 80 ++++++++++++++++++++-- 7 files changed, 138 insertions(+), 7 deletions(-) f58f43e Add pm operation to set user restrictions. 3e16049 Reduce shell power over user management. f69f787 DO NOT MERGE Disable app pinning when emergency call button pressed ========platform/frameworks/native between android-6.0.1_r55..android-6.0.1_r63========= include/ui/FrameStats.h | 1 + 1 file changed, 1 insertion(+) 4308ad0 Add FrameStats default constructor ========platform/frameworks/opt/net/wifi between android-6.0.1_r55..android-6.0.1_r63========= service/jni/com_android_server_wifi_WifiNative.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) 2db8905 Deal correctly with short strings ========platform/frameworks/opt/telephony between android-6.0.1_r55..android-6.0.1_r63========= .../android/internal/telephony/cdma/CdmaServiceStateTracker.java | 6 ++++++ .../com/android/internal/telephony/gsm/GsmServiceStateTracker.java | 6 ++++++ 2 files changed, 12 insertions(+) 05af6c6 backport security fix: avoid set NITZ time to 2038 ========platform/hardware/qcom/media between android-6.0.1_r55..android-6.0.1_r63========= mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 2 ++ 1 file changed, 2 insertions(+) 014685c DO NOT MERGE Fix wrong nAllocLen ========platform/packages/apps/Nfc between android-6.0.1_r55..android-6.0.1_r63========= src/com/android/nfc/NfcService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 70737b6 Allow system_server access to NFC reader mode API. ========platform/system/core between android-6.0.1_r55..android-6.0.1_r63========= rootdir/init.rc | 5 +++++ 1 file changed, 5 insertions(+) 32fb365 add a property for controlling perf_event_paranoid