summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/am
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge "Fix issue #10948509: Crash in procstats when there is no data" into kl...Dianne Hackborn2013-09-302-16/+28
| |\
| | * Fix issue #10948509: Crash in procstats when there is no dataDianne Hackborn2013-09-292-16/+28
* | | am 64ce6b78: Merge "Don\'t kill home process with the rest of its package." i...Craig Mautner2013-09-301-0/+4
|\| |
| * | Merge "Don't kill home process with the rest of its package." into klp-devCraig Mautner2013-09-291-0/+4
| |\ \
| | * | Don't kill home process with the rest of its package.Craig Mautner2013-09-281-0/+4
| | |/
* | | am 5a0c54a5: Merge "Remove home package name methods." into klp-devCraig Mautner2013-09-304-50/+6
|\| |
| * | Merge "Remove home package name methods." into klp-devCraig Mautner2013-09-294-50/+6
| |\ \
| | * | Remove home package name methods.Craig Mautner2013-09-284-50/+6
| | |/
* | | am 16e6e203: Merge "Centralize handleAppDied and fix return to home." into kl...Craig Mautner2013-09-303-32/+65
|\| |
| * | Merge "Centralize handleAppDied and fix return to home." into klp-devCraig Mautner2013-09-283-32/+65
| |\ \
| | * | Centralize handleAppDied and fix return to home.Craig Mautner2013-09-273-32/+65
| | |/
* | | am 231bd6c5: Merge "Dismiss keyguard when resuming visible activities" into k...Craig Mautner2013-09-301-0/+4
|\| |
| * | Dismiss keyguard when resuming visible activitiesCraig Mautner2013-09-261-0/+4
| |/
* | am c449613e: Merge "Revert behavior to perform onResume." into klp-devCraig Mautner2013-09-303-47/+29
|\|
| * Revert behavior to perform onResume.Craig Mautner2013-09-263-47/+29
* | am 8c6c0419: Merge "Tighten flags enforcement, API to test Uris." into klp-devJeff Sharkey2013-09-262-20/+9
|\|
| * Tighten flags enforcement, API to test Uris.Jeff Sharkey2013-09-262-20/+9
* | am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in ...Dianne Hackborn2013-09-253-27/+120
|\|
| * Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" i...Dianne Hackborn2013-09-253-27/+120
| |\
| | * Fix issue #10903002: com.facebook.katana keeps itself in A ServicesDianne Hackborn2013-09-253-27/+120
* | | am be17a614: Merge "Require that persistable Uri permissions be taken." into ...Jeff Sharkey2013-09-252-113/+302
|\| |
| * | Require that persistable Uri permissions be taken.Jeff Sharkey2013-09-252-113/+302
| |/
* | am 8488f9fa: Merge "Be less aggressive when not resuming top activity" into k...Craig Mautner2013-09-241-6/+3
|\|
| * Merge "Be less aggressive when not resuming top activity" into klp-devCraig Mautner2013-09-251-6/+3
| |\
| | * Be less aggressive when not resuming top activityCraig Mautner2013-09-241-6/+3
* | | am 5f86b90b: Merge "Fix issue #10848916: "Always" button is not working." int...Dianne Hackborn2013-09-241-1/+2
|\| |
| * | Fix issue #10848916: "Always" button is not working.Dianne Hackborn2013-09-241-1/+2
| |/
* | am 254f5ffc: Merge "Pause activities behind keyguard after boot." into klp-devCraig Mautner2013-09-243-12/+55
|\|
| * Merge "Pause activities behind keyguard after boot." into klp-devCraig Mautner2013-09-243-12/+55
| |\
| | * Pause activities behind keyguard after boot.Craig Mautner2013-09-243-12/+55
* | | am 2d4eee38: Merge "Implement issue #10895990: Better durations for proc stat...Dianne Hackborn2013-09-231-2/+2
|\| |
| * | Merge "Implement issue #10895990: Better durations for proc stats" into klp-devDianne Hackborn2013-09-231-2/+2
| |\ \
| | * | Implement issue #10895990: Better durations for proc statsDianne Hackborn2013-09-231-2/+2
* | | | am ba0abd0a: Merge "Fix issue #10876433: java.lang.IllegalStateException in.....Dianne Hackborn2013-09-231-3/+4
|\| | |
| * | | Fix issue #10876433: java.lang.IllegalStateException in...Dianne Hackborn2013-09-231-3/+4
| |/ /
* | | am 4bf0fcef: Merge "Work on issue #10759595: preferred tag doesn\'t prevent.....Dianne Hackborn2013-09-231-0/+9
|\| |
| * | Merge "Work on issue #10759595: preferred tag doesn't prevent..." into klp-devDianne Hackborn2013-09-231-0/+9
| |\ \
| | * | Work on issue #10759595: preferred tag doesn't prevent...Dianne Hackborn2013-09-231-0/+9
* | | | am e14d0c21: Merge "Ensure that activities behind keyguard are paused." into ...Craig Mautner2013-09-231-5/+3
|\| | |
| * | | Merge "Ensure that activities behind keyguard are paused." into klp-devCraig Mautner2013-09-231-5/+3
| |\ \ \ | | | |/ | | |/|
| | * | Ensure that activities behind keyguard are paused.Craig Mautner2013-09-231-5/+3
| | |/
* | | am f9b70ab8: Merge "Debug issue #10876433 java.lang.IllegalStateException..."...Dianne Hackborn2013-09-224-18/+33
|\| |
| * | Debug issue #10876433 java.lang.IllegalStateException...Dianne Hackborn2013-09-224-18/+33
| |/
* | am 88b6e69b: Merge "Fix issue #10863270: procstats UI is showing all green" i...Dianne Hackborn2013-09-202-11/+2
|\|
| * Fix issue #10863270: procstats UI is showing all greenDianne Hackborn2013-09-202-11/+2
* | am 12946530: Merge "Only show launcher for the bottom activity in a task" int...Craig Mautner2013-09-191-1/+1
|\|
| * Merge "Only show launcher for the bottom activity in a task" into klp-devCraig Mautner2013-09-201-1/+1
| |\
| | * Only show launcher for the bottom activity in a taskCraig Mautner2013-09-191-1/+1
* | | am 722b15e0: Merge "Fix a regression in pausing activity immediately on sleep...Amith Yamasani2013-09-191-1/+1
|\| |
| * | Merge "Fix a regression in pausing activity immediately on sleep" into klp-devAmith Yamasani2013-09-191-1/+1
| |\ \