summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_b...Wolfgang Wiedmeyer2016-12-12195-1298/+41750
|\
| * Automatic translation importinky@build012016-12-022-2/+2
| * Automatic translation importinky@build012016-11-292-94/+1
| * Themes: Don't cache explicitly themed resourcesBharadwaj Narasimha2016-11-281-26/+1
| * Build: use UserHandle.isApp for M compatibilityZhao Wei Liew2016-11-271-1/+1
| * Make Build.TYPE and Build.FINGERPRINT consistent for apps.Danny Baumann2016-11-252-0/+43
| * zygote: Allow device to append extra whitelisted pathsLuca Stefani2016-11-172-1/+35
| * zygote: Add /proc/ged to the FD whitelistRicardo Cerqueira2016-11-121-1/+2
| * frameworks/base: Addition of Changes for ZeroBalance featurePragnya Paramita2016-11-103-0/+109
| * NotificationManager: Concentrate LED light capabilities at a single locationRicardo Cerqueira2016-11-104-0/+56
| * Add CMSDK resource APK to Zygote FD whitelistSteve Kondik2016-11-101-1/+2
| * Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-098-15/+602
| |\
| | * Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9...Jeff Sharkey2016-09-271-3/+3
| | * Ensure munmap matches mmapJohn Reck2016-09-274-10/+11
| | * Fix setPairingConfirmation permissions issue (2/2)Marie Janssen2016-09-271-2/+2
| | * Backport changes to whitelist sockets opened by the zygote.Narayan Kamath2016-09-272-0/+586
| | * Bind fingerprint when we start authentication - DO NOT MERGEJim Miller2016-08-252-7/+16
| | * Process: Fix communication with zygote.Narayan Kamath2016-08-251-6/+15
| | * Fix vulnerability in LockSettings serviceJim Miller2016-08-251-2/+2
| * | Support enforcing a minimum delay between notification sounds of an app.Danny Baumann2016-10-201-0/+3
| * | (Optionally) allow vibration during priority zen mode.Danny Baumann2016-10-192-3/+3
| * | Merge tag 'android-6.0.1_r72' into HEADJessica Wagantall2016-10-064-15/+33
| |\ \
| | * | Bind fingerprint when we start authentication - DO NOT MERGEJim Miller2016-08-262-7/+16
| | * | Process: Fix communication with zygote.Narayan Kamath2016-08-261-6/+15
| | * | Fix vulnerability in LockSettings serviceJim Miller2016-08-261-2/+2
| | * | Reduce shell power over user management.Sudheer Shanka2016-08-171-0/+8
| * | | Automatic translation importpinky@build012016-09-272-121/+59
| * | | PhoneWindowManager: set focus flags on keyguard panelsRoman Birg2016-09-081-0/+1
| * | | Automatic translation importclyde@build012016-09-061-1/+1
| * | | Automatic translation importpinky@build012016-08-278-21/+5135
| * | | Themes: Give power dialogs own set of volume icons for themesBryan Owens2016-08-265-4/+80
| * | | Apps on adopted storage should stay there during updateSam Mortimer2016-08-171-9/+9
| * | | Automatic translation importblinky@build012016-08-132-5/+7
| * | | [2/2] base: cm custom boot dexopt UIAlexander Martinz2016-08-103-10/+25
| * | | IconPackHelper:Use un-tinted iconback when no defaultSwatchcolor is specifiedBharadwaj Narasimha2016-08-091-5/+3
| * | | Automatic translation importblinky@build012016-08-081-4/+4
| * | | fw: enforce android.permission.PREVENT_SYSTEM_KEYS in system serverScott Mertz2016-08-051-7/+0
| * | | Themes: Add permission to themes protected broadcastsd34d2016-08-021-2/+5
| * | | Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-024-6/+25
| |\ \ \ | | | |/ | | |/|
| | * | Reduce shell power over user management.Sudheer Shanka2016-06-241-0/+8
| | * | DO NOT MERGE Fix intent filter prioritiesTodd Kennedy2016-06-241-1/+10
| | * | Don't trust callers to supply app info to bindBackupAgent()Christopher Tate2016-06-242-5/+7
| | |/
| * | Improve the scan processmqi2016-07-261-2/+8
| * | Factory reset: Wipe media by defaultScott Mertz2016-07-251-3/+3
| * | Automatic translation importinky@build012016-07-221-3/+3
| * | PackageManager: make protected-broadcasts permission awareRoman Birg2016-07-213-4/+15
| * | Automatic translation importpinky@build012016-07-192-1/+2
| * | Automatic translation importinky@build012016-07-152-1/+22
| * | Automatic translation importclyde@build012016-07-112-2/+2
| * | Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-072-1/+22
| |\ \ | | |/