summaryrefslogtreecommitdiffstats
path: root/services/java/com/android
Commit message (Expand)AuthorAgeFilesLines
* am cd9cd758: am c213b3a3: am f7f80d7b: Merge "Start the dream manager even if...Jeff Brown2014-02-241-3/+2
|\
| * am f7f80d7b: Merge "Start the dream manager even if dreams are not supported....Jeff Brown2014-02-241-3/+2
| |\
| | * Merge "Start the dream manager even if dreams are not supported." into klp-mo...Jeff Brown2014-02-241-3/+2
| | |\
| | | * Start the dream manager even if dreams are not supported.Jeff Brown2014-02-241-3/+2
* | | | am 542b55d9: am c8661519: am 83930aa0: Merge "Fix broken IME when decrypting ...Adam Lesinski2014-02-221-128/+121
|\ \ \ \ | |/ / /
| * | | am 83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-devAdam Lesinski2014-02-211-128/+121
| |\ \ \ | | |/ /
| | * | Fix broken IME when decrypting storageAdam Lesinski2014-02-211-128/+121
| | |/
* | | Merge "Initial round of MediaSession APIs"RoboErik2014-02-201-0/+8
|\ \ \
| * | | Initial round of MediaSession APIsRoboErik2014-02-191-0/+8
* | | | Fix build due to change in SystemServiceManagerAdam Lesinski2014-02-191-6/+6
* | | | am 13c83996: am 1c532c2e: am 4b07b26e: Merge "Make UsbService optional" into ...Adam Lesinski2014-02-191-135/+141
|\ \ \ \ | | |/ / | |/| |
| * | | am 4b07b26e: Merge "Make UsbService optional" into klp-modular-devAdam Lesinski2014-02-191-135/+141
| |\ \ \ | | | |/ | | |/|
| | * | Make UsbService optionalAdam Lesinski2014-02-181-135/+141
* | | | am 019b1f26: am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print an...Adam Lesinski2014-02-181-4/+4
|\ \ \ \ | |/ / /
| * | | am 3d9bcb90: Create FEATURE_ constants for print and backupAdam Lesinski2014-02-181-4/+4
| |\ \ \ | | |/ /
| | * | Create FEATURE_ constants for print and backupAdam Lesinski2014-02-181-4/+4
* | | | am ce0552f3: am 8a4c2bb1: am 567f7ca4: Refactor dream manager to new pattern.Jeff Brown2014-02-141-21/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am 567f7ca4: Refactor dream manager to new pattern.Jeff Brown2014-02-141-21/+5
| |\ \ | | |/
| | * Refactor dream manager to new pattern.Jeff Brown2014-02-131-21/+5
* | | am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Contex...Jeff Brown2014-02-111-2/+3
|\ \ \ | |/ /
| * | am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-...Jeff Brown2014-02-111-2/+3
| |\ \ | | |/
| | * Make SystemService constructor take a Context.Jeff Brown2014-02-101-2/+3
* | | am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional s...Adam Lesinski2014-02-061-0/+1148
|\ \ \ | |/ /
| * | am 7f416631: Merge "Check feature bits before loading optional services" into...Adam Lesinski2014-02-061-0/+1155
| |\ \ | | |/
| | * Check feature bits before loading optional servicesAdam Lesinski2014-02-051-0/+1155
| |/
* | Merge "Move files to new directory structure of framework services"Amith Yamasani2013-12-1911-13433/+0
|\ \
| * | Move files to new directory structure of framework servicesAmith Yamasani2013-12-1911-13433/+0
* | | am 9158825f: Move some system services to separate directoriesAmith Yamasani2013-12-19284-193339/+0
|\ \ \ | |/ / |/| / | |/
| * Move some system services to separate directoriesAmith Yamasani2013-12-19284-192661/+0
* | Restore parameter lost in merge.Craig Mautner2013-12-191-1/+1
* | resolved conflicts for merge of b7bba718 to masterCraig Mautner2013-12-197-393/+716
|\ \ | |/
| * Merge "Pair ActivityStacks with Displays" into klp-modular-devCraig Mautner2013-12-197-412/+716
| |\
| | * Pair ActivityStacks with DisplaysCraig Mautner2013-12-187-412/+716
* | | DO NOT MERGE: Eliminate StackBox.Craig Mautner2013-12-1910-767/+239
* | | am b905a37c: am 46f618a7: am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydi...Craig Mautner2013-12-191-0/+1
|\ \ \ | |/ /
| * | am 46f618a7: am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching tim...Craig Mautner2013-12-191-0/+1
| |\ \
| | * \ am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while fi...Craig Mautner2013-12-191-0/+1
| | |\ \
| | | * \ am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity"Craig Mautner2013-12-191-0/+1
| | | |\ \
| | | | * | Keydispatching timeout while finish ActivityMartin Wallgren2013-12-191-0/+1
* | | | | | Merge "Removed print services not fully cleaned up."Svetoslav2013-12-192-6/+33
|\ \ \ \ \ \
| * | | | | | Removed print services not fully cleaned up.Svetoslav2013-12-182-6/+33
* | | | | | | am 525680d2: Merge "Fix loop limits." into klp-modular-devCraig Mautner2013-12-191-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Fix loop limits.Craig Mautner2013-12-181-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Clear cached locations when location providers disabledDavid Christie2013-12-181-0/+5
* | | | | | Remove data dirs if a new install fails dexopt.Narayan Kamath2013-12-181-4/+11
| |/ / / / |/| | | |
* | | | | am f1bdbdd1: resolved conflicts for merge of 08579921 to klp-modular-devGreg Hackmann2013-12-171-14/+14
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of 08579921 to klp-modular-devGreg Hackmann2013-12-171-14/+14
| |\ \ \ \ | | |/ / /
| | * | | am 060ae1db: am eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService"Greg Hackmann2013-12-171-14/+14
| | |\ \ \ | | | |/ /
| | | * | am eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService"Greg Hackmann2013-12-171-14/+14
| | | |\ \ | | | | |/
| | | | * Merge "Add timerfd backend to AlarmManagerService"Greg Hackmann2013-12-171-14/+14
| | | | |\