summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 90e2301e: am d2a11d97: Merge "Add explicit close of Scanner input"Elliott Hughes2014-04-111-1/+6
|\
| * am d2a11d97: Merge "Add explicit close of Scanner input"Elliott Hughes2014-04-111-1/+6
| |\
| | * Merge "Add explicit close of Scanner input"Elliott Hughes2014-04-111-1/+6
| | |\
| | | * Add explicit close of Scanner inputMichael Ollanketo2014-01-091-1/+6
* | | | am 24c089a8: Fix build.Narayan Kamath2014-04-111-3/+3
|\ \ \ \
| * | | | Fix build.Narayan Kamath2014-04-111-3/+3
* | | | | am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subc...Jinsuk Kim2014-04-114-19/+91
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into kl...Jinsuk Kim2014-04-114-19/+91
| |\ \ \ \
| | * | | | Delegate HdmiCecService method impl to HdmiCecDevice subclassJinsuk Kim2014-04-114-19/+91
* | | | | | am f24687e2: Merge "Plumb display power state through display manager." into ...Jeff Brown2014-04-1119-466/+407
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Plumb display power state through display manager." into klp-modular-devJeff Brown2014-04-1119-466/+407
| |\ \ \ \ \
| | * | | | | Plumb display power state through display manager.Jeff Brown2014-04-1019-466/+407
| * | | | | | Merge "Merge "NsdService does not clean up after exiting clients"" into klp-m...Jesse Gunsch2014-04-091-17/+64
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge "NsdService does not clean up after exiting clients"Dave Platt2014-04-081-17/+64
| | |/ / / /
* | | | | | am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ...Narayan Kamath2014-04-106-20/+57
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 09e13cc5: Merge "System services detect and register app CPU ABIs"Narayan Kamath2014-04-106-20/+57
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | System services detect and register app CPU ABIsRamin Zaghi2014-04-096-20/+57
* | | | | | am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies."Narayan Kamath2014-04-101-9/+33
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 80413c9f: Merge "Re-implement native library search and copies."Narayan Kamath2014-04-101-9/+33
| |\ \ \ \ \ | | |/ / / /
| | * | | | Re-implement native library search and copies.Ramin Zaghi2014-04-091-9/+33
* | | | | | resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aospJeff Brown2014-04-092-53/+28
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Move certain internal activity manager methods to new class.Jeff Brown2014-04-082-54/+28
* | | | | | am ea72cdf2: Merge "Move display power controller to display manager service....Jeff Brown2014-04-099-336/+145
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Move display power controller to display manager service. (DO NOT MERGE)Jeff Brown2014-04-089-336/+145
| | |_|/ / | |/| | |
* | | | | am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong...Craig Mautner2014-04-071-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."Craig Mautner2014-04-071-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [ActivityManager] Reduce report ANR on wrong activity.riddle_hsu2014-04-081-1/+1
* | | | | am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp...John Spurlock2014-04-041-2/+8
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Introduce new UI_MODE_TYPE_WATCH and qualifier.John Spurlock2014-04-041-2/+8
* | | | | am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modu...Jinsuk Kim2014-04-033-65/+30
|\ \ \ \ \ | |/ / / /
| * | | | Use build property for CEC device OSD nameJinsuk Kim2014-04-033-65/+30
* | | | | am b1dca162: Merge "Maintain display power status for playback device" into k...Jinsuk Kim2014-04-024-13/+197
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Maintain display power status for playback device" into klp-modular-devJinsuk Kim2014-04-024-13/+197
| |\ \ \ \
| | * | | | Maintain display power status for playback deviceJinsuk Kim2014-04-024-13/+197
* | | | | | am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."Narayan Kamath2014-04-022-3/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."Narayan Kamath2014-04-022-3/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Move zygote startup logic to the frameworks.Narayan Kamath2014-04-022-3/+2
* | | | | | am 875eff83: Merge "Add circular anti-aliasing mask to circular display" into...Michael Kolb2014-04-012-0/+155
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Add circular anti-aliasing mask to circular displayMichael Kolb2014-04-012-0/+155
* | | | | | am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/dat...Nick Kralevich2014-03-312-9/+21
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."Nick Kralevich2014-03-312-9/+21
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Change when the SELinux relabel of /data/data occurs."Nick Kralevich2014-03-312-9/+21
| | |\ \ \ \
| | | * | | | Change when the SELinux relabel of /data/data occurs.Robert Craig2014-03-282-9/+21
* | | | | | | resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aospNarayan Kamath2014-03-312-3/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am ab561f5b: Merge "Don\'t make isSafeMode a field on the Zygote class."Narayan Kamath2014-03-312-2/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Don't make isSafeMode a field on the Zygote class.Narayan Kamath2014-03-312-2/+7
* | | | | | | am 41eaa32c: Merge "Replace individual methods with a consolidated CEC native...Jinsuk Kim2014-03-312-127/+75
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Replace individual methods with a consolidated CEC nativeSendmessage" ...Jinsuk Kim2014-03-312-127/+75
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Replace individual methods with a consolidated CEC nativeSendmessageJinsuk Kim2014-03-272-127/+75
* | | | | | | am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start...Craig Mautner2014-03-281-0/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |