summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_bas...HEADreplicant-6.0-0001replicant-6.0Wolfgang Wiedmeyer2017-05-023-0/+13
|\
| * Prevent writing to FRP partition during factory reset.Charles He2017-03-221-0/+5
| * DO NOT MERGE. Retain DownloadManager Uri grants when clearing.Jeff Sharkey2017-03-131-0/+2
| * DO NOT MERGE: Check provider access for content changes.Jeff Sharkey2017-03-131-0/+6
* | Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_bas...Wolfgang Wiedmeyer2017-02-111-8/+1
|\ \ | |/
| * Revert "Add CM PlatLogo (1/2)"Zhao Wei Liew2016-12-291-8/+1
* | Camera: Working barcode scanning with software renderingWolfgang Wiedmeyer2017-01-041-1/+21
* | LockPatternUtils: userId is requiredWolfgang Wiedmeyer2016-12-161-2/+2
* | support separate encryption/lockscreen passwordsDaniel Micay2016-12-162-3/+76
* | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_b...Wolfgang Wiedmeyer2016-12-1255-169/+751
|\ \ | |/
| * 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
| * frameworks/base: Addition of Changes for ZeroBalance featurePragnya Paramita2016-11-101-0/+99
| * NotificationManager: Concentrate LED light capabilities at a single locationRicardo Cerqueira2016-11-102-0/+30
| * Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-092-5/+5
| |\
| | * Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9...Jeff Sharkey2016-09-271-3/+3
| | * Fix setPairingConfirmation permissions issue (2/2)Marie Janssen2016-09-271-2/+2
| | * 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
| * | | PhoneWindowManager: set focus flags on keyguard panelsRoman Birg2016-09-081-0/+1
| * | | Apps on adopted storage should stay there during updateSam Mortimer2016-08-171-9/+9
| * | | [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
| * | | fw: enforce android.permission.PREVENT_SYSTEM_KEYS in system serverScott Mertz2016-08-051-7/+0
| * | | Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-023-6/+17
| |\ \ \ | | | |/ | | |/|
| | * | 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
| * | PackageManager: make protected-broadcasts permission awareRoman Birg2016-07-212-4/+14
| * | Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-072-1/+22
| |\ \ | | |/
| | * Backport ChooserTarget package source check from NAdam Powell2016-05-271-1/+13
| | * Don't pass URL path and username/password to PAC scriptsPaul Jensen2016-05-271-0/+9
| * | BT: Set persiste Bluetooth State during enable timeout caseGurpreet Ghai2016-07-021-1/+3
| * | WindowAnimator : Check KEYGUARD_PANEL when deciding to show/hide windowDanesh M2016-06-291-0/+5
| * | Framework: allow ResolverActivity to be specialized from other packageWilhelm Fitzpatrick2016-06-092-2/+148
| * | Merge tag 'android-6.0.1_r46' into HEADJessica Wagantall2016-06-071-0/+15
| |\ \ | | |/
| | * Add new, hidden MotionEvent flag for partially obscured windows.Michael Wright2016-04-211-0/+15
| * | Frameworks: Add per app controls for LP keyguard notifications (1/2)Lars Greiss2016-06-013-0/+29
| * | fw: reintroduce PRIVATE_FLAG_PREVENT_POWER_KEYScott Mertz2016-05-312-2/+11
| * | Core: Fix OOBMichael W2016-05-301-0/+5
| * | Add CM version to dropbox entriesScott Mertz2016-05-251-0/+1