summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/am/ActivityManagerService.java
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Prepare WindowManager for multiple stacks.Craig Mautner2013-04-061-4/+4
* | | | | | am 26c702c3: am ba880da4: Merge "Fix issue #7643046: Activity.getCallingPacka...Dianne Hackborn2013-04-111-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix issue #7643046: Activity.getCallingPackage() bogusly returns null...Dianne Hackborn2013-04-111-1/+1
| | |/ / / | |/| | |
* | | | | resolved conflicts for merge of e9b4ee69 to masterDianne Hackborn2013-04-091-0/+15
|\| | | |
| * | | | Merge "Kill processes when permissions are revoked." into jb-mr2-devDianne Hackborn2013-04-091-0/+15
| |\ \ \ \
| | * | | | Kill processes when permissions are revoked.Dianne Hackborn2013-04-081-0/+15
| | | |/ / | | |/| |
* | | | | am fa67c5ad: am 3c09715c: Merge "Change dropbox tag for native crashes." into...Eric Rowe2013-04-081-3/+3
|\| | | | | |_|/ / |/| | |
| * | | Change dropbox tag for native crashes.Eric Rowe2013-04-081-3/+3
| |/ /
* | | resolved conflicts for merge of 2ab72e1f to masterBen Gruver2013-04-031-2/+14
|\| |
| * | Merge "Initial implementation of IntentFirewall functionality" into jb-mr2-devBen Gruver2013-04-031-3/+15
| |\ \
| | * | Initial implementation of IntentFirewall functionalityBen Gruver2013-04-021-3/+15
* | | | Merge "Move startActivityUncheckedLocked to Supervisor"Craig Mautner2013-04-031-1/+1
|\ \ \ \
| * | | | Move startActivityUncheckedLocked to SupervisorCraig Mautner2013-04-021-1/+1
* | | | | Merge "Move startActivity from ActivityStack to Supervisor"Craig Mautner2013-04-031-4/+7
|\| | | |
| * | | | Move startActivity from ActivityStack to SupervisorCraig Mautner2013-04-021-4/+7
* | | | | Merge "Fix potential synch problems."Craig Mautner2013-04-031-10/+11
|\| | | |
| * | | | Fix potential synch problems.Craig Mautner2013-04-021-10/+11
* | | | | Perform activityIdleInternal in correct order.Craig Mautner2013-04-021-5/+5
|/ / / /
* | | | resolved conflicts for merge of c16da6aa to masterKenny Root2013-04-021-3/+16
|\| | |
| * | | debuggerd now notifies the Activity Manager about native crashesChristopher Tate2013-04-011-4/+17
| |/ /
* | | Yet more movement from ActivityStack to SupervisorCraig Mautner2013-04-011-1/+1
* | | More movement from ActivityStack to SupervisorCraig Mautner2013-04-011-9/+19
* | | Migrate activity starts into ActivityStackSupervisor.Craig Mautner2013-04-011-13/+21
* | | Remove mFocusedStack from ActivityManagerService.Craig Mautner2013-04-011-53/+48
* | | Minor refactorsCraig Mautner2013-04-011-10/+9
* | | Merge "Move mStacks to ActivityStackSupervisor"Craig Mautner2013-04-011-342/+42
|\ \ \
| * | | Move mStacks to ActivityStackSupervisorCraig Mautner2013-03-281-342/+42
* | | | am 177543db: am 3bcc2fba: Merge "Fix issue #8470131: Process thrash kills bat...Dianne Hackborn2013-03-261-0/+27
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge "Fix issue #8470131: Process thrash kills battery" into jb-mr2-devDianne Hackborn2013-03-271-0/+27
| |\ \
| | * | Fix issue #8470131: Process thrash kills batteryDianne Hackborn2013-03-251-0/+27
* | | | Modify primary ActivityStack accessing.Craig Mautner2013-03-261-24/+20
* | | | am d6c1394d: am 51163e3b: Merge "Add seinfo parsing to PackageManagerService....Geremy Condra2013-03-261-1/+1
|\| | |
| * | | Add seinfo parsing to PackageManagerService.Robert Craig2013-03-251-1/+1
| |/ /
* | | Introduce ActivityStackSupervisor.Craig Mautner2013-03-251-11/+19
* | | Complete removal of Task from DisplayContent.Craig Mautner2013-03-171-1/+2
* | | Start moving Tasks from DisplayContent to TaskStackCraig Mautner2013-03-151-20/+73
* | | Add ActivityStack to PendingActivityLaunchCraig Mautner2013-03-111-5/+14
* | | am 0de66314: am 6916c6ee: Merge "Do not hang in pm clear on an invalid packag...Christopher Tate2013-03-081-1/+8
|\| |
| * | Do not hang in pm clear on an invalid package nameChristopher Tate2013-03-071-1/+8
* | | Prepare ActivityManagerService for multiple stacks.Craig Mautner2013-03-061-237/+382
* | | am 32440aa2: Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOu...Michael Wright2013-03-011-16/+43
|\| |
| * | Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr...Michael Wright2013-03-011-16/+43
| |\ \
| | * | Unify inputDispatchingTimedOut with keyDispatchingTimedOutMichael Wright2013-03-011-16/+43
* | | | am 173bb615: Merge "Move stack dump off of InputDispatcher thread" into jb-mr...Michael Wright2013-02-261-2/+8
|\| | |
| * | | Merge "Move stack dump off of InputDispatcher thread" into jb-mr2-devMichael Wright2013-02-261-2/+8
| |\| |
| | * | Move stack dump off of InputDispatcher threadMichael Wright2013-02-251-2/+8
| |/ / |/| |
| * | Revert ActivityManager changes for tasks. DO NOT MERGECraig Mautner2013-02-251-42/+365
|/ /
* | Merge "Add AppWindowTokens to TaskList."Craig Mautner2013-02-121-114/+4
|\ \
| * | Add AppWindowTokens to TaskList.Craig Mautner2013-02-121-114/+4
* | | Merge "App ops: cleanup, handle root and shell, perms."Dianne Hackborn2013-02-121-1/+7
|\ \ \ | |/ / |/| |