| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge "resolved conflicts for merge of b6d6c04a to master" | Andreas Gampe | 2015-03-11 | 2 | -4/+6 |
| |\ | |||||
| | * | resolved conflicts for merge of b6d6c04a to master | Andreas Gampe | 2015-03-10 | 2 | -4/+6 |
| | |\ | |||||
| | | * | am 174a4488: am 7f383873: Merge "Frameworks/base: Pass APK debugability to in... | Andreas Gampe | 2015-03-10 | 2 | -4/+6 |
| | | |\ | |||||
| | | | * | am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd" | Andreas Gampe | 2015-03-10 | 2 | -4/+6 |
| | | | |\ | |||||
| | | | | * | Merge "Frameworks/base: Pass APK debugability to installd" | Andreas Gampe | 2015-03-09 | 2 | -4/+6 |
| | | | | |\ | |||||
| | | | | | * | Frameworks/base: Pass APK debugability to installd | Andreas Gampe | 2015-03-09 | 2 | -4/+6 |
| * | | | | | | Merge "Notify TrustAgentService when device policy configuration no longer ap... | Adrian Roos | 2015-03-11 | 1 | -0/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Notify TrustAgentService when device policy configuration no longer applies | Adrian Roos | 2015-03-09 | 1 | -0/+3 |
| * | | | | | | | Merge "Handle simultaneous connect of devices with the same "type" (as in USB)" | Paul McLean | 2015-03-10 | 1 | -70/+118 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Handle simultaneous connect of devices with the same "type" (as in USB) | Paul McLean | 2015-03-10 | 1 | -70/+118 |
| * | | | | | | | | Merge "Revert "Remove activity and window stacks when last task is removed."" | Wale Ogunwale | 2015-03-10 | 3 | -26/+13 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| | * | | | | | | | Revert "Remove activity and window stacks when last task is removed." | Wale Ogunwale | 2015-03-10 | 3 | -26/+13 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge "ZenLog: Track changes to effect suppressorship." | John Spurlock | 2015-03-10 | 2 | -0/+26 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | ZenLog: Track changes to effect suppressorship. | John Spurlock | 2015-03-09 | 2 | -0/+26 |
| * | | | | | | | | Merge "Move more file handling into LockSettingsStorage" | Robin Lee | 2015-03-10 | 1 | -4/+12 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Move more file handling into LockSettingsStorage | Robin Lee | 2015-03-10 | 1 | -4/+12 |
| * | | | | | | | | | Merge "MediaSession: Notify PlaybackInfo callbacks when playback type changes." | John Spurlock | 2015-03-10 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | MediaSession: Notify PlaybackInfo callbacks when playback type changes. | John Spurlock | 2015-03-10 | 1 | -0/+2 |
| | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge "Revert "Revert "Add a timeout state to frozen windows""" | Craig Mautner | 2015-03-10 | 1 | -9/+17 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Revert "Revert "Add a timeout state to frozen windows"" | Craig Mautner | 2015-03-10 | 1 | -9/+17 |
| * | | | | | | | | | | Merge "Revert "Add a timeout state to frozen windows"" | Craig Mautner | 2015-03-10 | 1 | -17/+9 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Revert "Add a timeout state to frozen windows" | Craig Mautner | 2015-03-10 | 1 | -17/+9 |
| * | | | | | | | | | | Merge "Add a timeout state to frozen windows" | Craig Mautner | 2015-03-10 | 1 | -9/+17 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | | | |||||
| | * | | | | | | | | Add a timeout state to frozen windows | Craig Mautner | 2015-03-05 | 1 | -9/+17 |
| | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | | Merge "Battery stats issues: fix jiffy handling, print scan counts." | Dianne Hackborn | 2015-03-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Battery stats issues: fix jiffy handling, print scan counts. | Dianne Hackborn | 2015-03-09 | 1 | -1/+1 |
| * | | | | | | | | | Merge "AudioService: Fix device dump in dumpsys output." | John Spurlock | 2015-03-09 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | AudioService: Fix device dump in dumpsys output. | John Spurlock | 2015-03-09 | 1 | -1/+3 |
| * | | | | | | | | | | resolved conflicts for merge of ca54b876 to master | Wale Ogunwale | 2015-03-09 | 1 | -23/+20 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | | am edc3c893: am 14ccc26f: Merge "[ActivityManager] Skip receiver precisely." | Olawale Ogunwale | 2015-03-09 | 1 | -16/+11 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| | | * | | | | | | | | am 14ccc26f: Merge "[ActivityManager] Skip receiver precisely." | Olawale Ogunwale | 2015-03-09 | 1 | -16/+11 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | |||||
| | | | * | | | | | | | Merge "[ActivityManager] Skip receiver precisely." | Olawale Ogunwale | 2015-03-09 | 1 | -16/+11 |
| | | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | | | * | | | | | | [ActivityManager] Skip receiver precisely. | riddle_hsu | 2015-03-04 | 1 | -16/+11 |
| * | | | | | | | | | | Merge "Prevent receiver leak in TrustAgentWrapper" | Adrian Roos | 2015-03-09 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Prevent receiver leak in TrustAgentWrapper | Adrian Roos | 2015-03-05 | 1 | -0/+1 |
| | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | | am 1b8df04b: am 8aeab6c8: Allow the keyguard service to be configurable. | Bryce Lee | 2015-03-09 | 1 | -5/+8 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | | am 168d0ade: am 1e53b98c: Merge "Allow press and hold from non-interactive." ... | Bryce Lee | 2015-03-09 | 1 | -4/+19 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | | Block setting wallpapers from managed profiles. | Benjamin Franz | 2015-03-09 | 2 | -8/+61 |
| | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | | Add new debug feature to automatically create heap dumps. | Dianne Hackborn | 2015-03-06 | 3 | -8/+303 |
| * | | | | | | | | Merge "Cleanup Bitmap JNI attempt #2" | John Reck | 2015-03-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Cleanup Bitmap JNI attempt #2 | John Reck | 2015-03-05 | 1 | -1/+1 |
| * | | | | | | | | | am 0fcfae88: am ecc20aaf: am 63ab6eb2: Merge "Frameworks/base: Use ArraySet m... | Andreas Gampe | 2015-03-05 | 1 | -10/+14 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | | am ecc20aaf: am 63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly" | Andreas Gampe | 2015-03-05 | 1 | -10/+14 |
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| | | * | | | | | | | am 63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly" | Andreas Gampe | 2015-03-05 | 1 | -10/+14 |
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | |||||
| | | | * | | | | | | Frameworks/base: Use ArraySet more explicitly | Andreas Gampe | 2015-03-05 | 1 | -10/+14 |
| * | | | | | | | | | Merge "AudioService: Add current stream devices to dumpsys output." | John Spurlock | 2015-03-05 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | | AudioService: Add current stream devices to dumpsys output. | John Spurlock | 2015-03-05 | 1 | -0/+13 |
| | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | | Merge "Revert "Cleanup Bitmap JNI"" | Chad Jones | 2015-03-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Revert "Cleanup Bitmap JNI" | Chad Jones | 2015-03-05 | 1 | -1/+1 |
| * | | | | | | | | Merge "Made AM package debug log more configurable." | Wale Ogunwale | 2015-03-05 | 5 | -110/+207 |
| |\ \ \ \ \ \ \ \ | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |