Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Made AM package debug log more configurable. | Wale Ogunwale | 2015-03-04 | 5 | -110/+207 |
* | | | | | | | | | Merge "Cleanup Bitmap JNI" | John Reck | 2015-03-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Cleanup Bitmap JNI | John Reck | 2015-03-05 | 1 | -1/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Clean up the lock task APIs for COSU devices. | Benjamin Franz | 2015-03-05 | 3 | -27/+55 |
* | | | | | | | | Merge "CEC: Do not start queued actions for TV device" | Jinsuk Kim | 2015-03-05 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | CEC: Do not start queued actions for TV device | Jinsuk Kim | 2015-02-28 | 1 | -1/+0 |
* | | | | | | | | | Merge "MidiManager: Virtual MIDI devices are now implemented as Services" | Mike Lockwood | 2015-03-05 | 1 | -39/+270 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | MidiManager: Virtual MIDI devices are now implemented as Services | Mike Lockwood | 2015-03-04 | 1 | -39/+270 |
* | | | | | | | | | Merge "Audio: Remove the concept of master volume." | John Spurlock | 2015-03-04 | 5 | -273/+34 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Audio: Remove the concept of master volume. | John Spurlock | 2015-03-04 | 5 | -273/+34 |
* | | | | | | | | | | Merge "Remove spammy notification_cancel event log." | Chris Wren | 2015-03-04 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove spammy notification_cancel event log. | Chris Wren | 2015-03-04 | 1 | -2/+2 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Update immersive cling visuals | Adrian Roos | 2015-03-04 | 2 | -34/+38 |
* | | | | | | | | | Merge "Add new "daily stats" tracking to battery stats." | Dianne Hackborn | 2015-03-04 | 1 | -1/+18 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add new "daily stats" tracking to battery stats. | Dianne Hackborn | 2015-03-03 | 1 | -1/+18 |
* | | | | | | | | | am 5d3f00e3: am 358188f5: Merge "Change ActivityView startActivity state sequ... | Craig Mautner | 2015-03-03 | 2 | -37/+36 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | am 358188f5: Merge "Change ActivityView startActivity state sequence" into lm... | Craig Mautner | 2015-03-03 | 2 | -37/+36 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular... | Craig Mautner | 2015-03-03 | 2 | -37/+36 |
| | |\ \ \ \ \ \ \ \ |