summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/am
Commit message (Expand)AuthorAgeFilesLines
* Move some system services to separate directoriesAmith Yamasani2013-12-1946-37208/+0
* Merge "Pair ActivityStacks with Displays" into klp-modular-devCraig Mautner2013-12-194-405/+692
|\
| * Pair ActivityStacks with DisplaysCraig Mautner2013-12-184-405/+692
* | am 46f618a7: am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching tim...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
* | | | Fix loop limits.Craig Mautner2013-12-181-1/+1
| |_|/ |/| |
* | | am 38bcf6dc: am 422d7003: am f431daa2: Merge "Fix to NullPointerException on ...Craig Mautner2013-12-171-3/+1
|\| |
| * | am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."Craig Mautner2013-12-171-3/+1
| |\|
| | * Fix to NullPointerException on move back in ActivityStack.Daniel 2 Olofsson2013-12-171-3/+1
* | | Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGECraig Mautner2013-12-162-21/+23
* | | am 31b9ec01: am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead o...Kenny Root2013-12-131-2/+2
|\| |
| * | am 37c69fdd: Merge "Use java.util.Objects instead on internal API"Kenny Root2013-12-131-2/+2
| |\|
| | * Use java.util.Objects instead on internal APIKenny Root2013-12-131-2/+2
* | | Introduce a Lifecycle for system servicesAdam Lesinski2013-12-121-4/+5
* | | DO NOT MERGE: Eliminate StackBox.Craig Mautner2013-12-092-76/+55
* | | DO NOT MERGE: Remove obsolete "headless" supportMike Lockwood2013-12-092-24/+3
|/ /
* | am 2c082ae3: am 90e9b1d3: Fix issue #11790471: Crash removed home buttons and...Dianne Hackborn2013-11-211-3/+5
|\ \ | |/ |/|
| * Fix issue #11790471: Crash removed home buttons and notification bar/shadeDianne Hackborn2013-11-211-3/+5
* | am 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" int...Adam Lesinski2013-11-182-12/+10
|\|
| * Merge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-devAdam Lesinski2013-11-182-12/+10
| |\
| | * Do not hold direct ref BatteryStatsImpl$Uid$ProcAdam Lesinski2013-11-182-12/+10
* | | am 6e5cf573: am 99437f25: Merge "Ensure recipient can be launched before atte...Christopher Tate2013-11-141-0/+21
|\| |
| * | Merge "Ensure recipient can be launched before attempting broadcast delivery"...Christopher Tate2013-11-141-0/+21
| |\ \
| | * | Ensure recipient can be launched before attempting broadcast deliveryChristopher Tate2013-11-141-0/+21
| | |/
* | | am 59bf3be7: am 2e3ede74: Merge "Maybe fix issue #11634365: Leaking restartin...Dianne Hackborn2013-11-141-1/+20
|\| |
| * | Merge "Maybe fix issue #11634365: Leaking restarting services" into klp-devDianne Hackborn2013-11-141-1/+20
| |\ \
| | * | Maybe fix issue #11634365: Leaking restarting servicesDianne Hackborn2013-11-141-1/+20
* | | | am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-devCraig Mautner2013-11-131-1/+3
|\| | |
| * | | Merge "Add null pointer check." into klp-devCraig Mautner2013-11-141-1/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Add null pointer check.Craig Mautner2013-11-131-1/+3
| | |/
* | | am 679ba4e8: am 6cd206b2: Merge "Relayout windows that handle their own confi...Craig Mautner2013-11-121-3/+5
|\| |
| * | Relayout windows that handle their own config change.Craig Mautner2013-11-121-3/+5
| |/
* | am 0259c010: am 596e409e: Merge "Work on issue #11634365: Leaking restarting ...Dianne Hackborn2013-11-112-24/+45
|\|
| * Work on issue #11634365: Leaking restarting servicesDianne Hackborn2013-11-112-24/+45
* | am 7e40e317: am c85a1143: Merge "Fix issue #11630188: Still seeing some proce...Dianne Hackborn2013-11-111-0/+2
|\|
| * Fix issue #11630188: Still seeing some processes not on LRU list errorsDianne Hackborn2013-11-111-0/+2
* | am 22a97106: am 8cfa6d08: Merge "Use old task info when creating new task." i...Craig Mautner2013-11-111-3/+10
|\|
| * Use old task info when creating new task.Craig Mautner2013-11-101-3/+10
* | am f7dea15b: am c9ffd746: Merge "Don\'t call setTask twice." into klp-devCraig Mautner2013-11-071-9/+22
|\|
| * Merge "Don't call setTask twice." into klp-devCraig Mautner2013-11-071-9/+22
| |\
| | * Don't call setTask twice.Craig Mautner2013-11-071-9/+22
* | | am c0eb7e7b: am 20409674: Merge "If home activity is not fullscreen keep dril...Craig Mautner2013-11-071-1/+1
|\| |
| * | Merge "If home activity is not fullscreen keep drilling." into klp-devCraig Mautner2013-11-071-1/+1
| |\ \
| | * | If home activity is not fullscreen keep drilling.Craig Mautner2013-11-071-1/+1
| | |/
* | | am f1612bcf: am e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning."...Robert Greenwalt2013-11-071-0/+14
|\| |
| * | Merge "Add BatteryStats for Wifi Batched Scanning." into klp-devRobert Greenwalt2013-11-071-0/+14
| |\ \
| | * | Add BatteryStats for Wifi Batched Scanning.Robert Greenwalt2013-11-061-0/+14
* | | | am fbf4888d: am 9882d388: Merge "Fix issue #11223338: Not retaining service s...Dianne Hackborn2013-11-075-43/+90
|\| | |
| * | | Merge "Fix issue #11223338: Not retaining service started state while restart...Dianne Hackborn2013-11-075-43/+90
| |\ \ \ | | |/ / | |/| |