Merge tag 'android-6.0.1_r3' into 601r3
Android 6.0.1 release 3 * tag 'android-6.0.1_r3': (151 commits) Revert "Fix race condition when setting default ringtones" Fix race condition when setting default ringtones Block directory selection in openable modes. Kick movement preconditions onto handler thread. Revert "Remove -ffast-math from libhwui makefile" When the incoming light source is invalid, don't generate any shadow Early return when the scale is 0. Remove -ffast-math from libhwui makefile Revert "Use clang for libhwui" Convert ashmem bitmap thresholds to constants. Use clang for libhwui Limit persistent ashmem backed fds to a minimum of 128kB. Fix issue #25357209: Could not send SMS or MMS messages, had to reboot Fix a crash while printing ICCID because of alphabets in UICC. Fixed a bug where the panel could get stuck closing Improve comment on EXTRA_CALL_RAT_TYPE. NetworkTimeUpdateService: Grab a wakelock when manipulating system time Don't try overriding system fixed permissions on install PackageSettingBase needs to copy volume UUID. Handle "uninstalled" apps when pruning app-ops. ... Conflicts: core/res/res/values/config.xml core/res/res/values/symbols.xml services/core/java/com/android/server/MountService.java Change-Id: I284176dc03556678a76e6b698db2a2b08ecee8c3
Loading
Please register or sign in to comment