summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/am
Commit message (Collapse)AuthorAgeFilesLines
* Wait for animation complete before completing bootCraig Mautner2014-09-101-0/+22
| | | | | | | | | | Defer the boot process in ActivityManagerService, WindowManagerService and PowerManagerService until the boot animation has completed. Fixes bug 16309312. Change-Id: Ic5e0d627ca4ded3e211c5d2afece89da40d34642
* Merge changes I79ba54d7,I224fb4b6 into lmp-devAdam Lesinski2014-09-091-0/+7
|\ | | | | | | | | | | * changes: Make UsageStats API default on only for the system ActivityManager shouldn't return null for getCurrentUser
| * ActivityManager shouldn't return null for getCurrentUserAdam Lesinski2014-09-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | There was a race where ActivityManager would return null for getCurrentUser() when switching between guest accounts. This is because the Guest account was marked for deletion while it was still active. Bug:17290209 Change-Id: I224fb4b6836380e5acb7dbeb8f3343d74505f88a
* | Merge "Frameworks/base: Add native bridge post-fork initialization" into lmp-devAndreas Gampe2014-09-091-1/+8
|\ \
| * | Frameworks/base: Add native bridge post-fork initializationAndreas Gampe2014-09-081-1/+8
| | | | | | | | | | | | | | | | | | (cherry picked from commit d7746a8b65ee4690427ed798816f970218578fa3) Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
* | | Merge "Relax requirements on Activity.requestVisibleBehind" into lmp-devCraig Mautner2014-09-081-6/+8
|\ \ \ | |/ / |/| |
| * | Relax requirements on Activity.requestVisibleBehindCraig Mautner2014-09-071-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The requirement that the top app be resumed in order to request background visibility was too strict. In particular when the background app is pausing the top app will be stopped waiting for pause to complete. This is an appropriate time for the background app to request visibility but we were rejecting that request. Also, there is no need for the top app to have an active thread except to notify it of the changed state. Fixes bug 17383876. Change-Id: I52f910baf6c109565694e053445516e1e5fd1c48
* | | Merge "Ignore finishing activities when fetching the top" into lmp-devCraig Mautner2014-09-082-6/+6
|\ \ \ | |_|/ |/| |
| * | Ignore finishing activities when fetching the topCraig Mautner2014-09-072-6/+6
| |/ | | | | | | | | | | | | | | | | | | When the top activity is finishing we don't want to be comparing it for matches to launching activities. This was keeping curTop from matching itself when launching a lower task. Fixes bug 17383648. Change-Id: I837ac087ef965d99d12c98ab1c779de46716e204
* | Removing unnecessary delays, ensuring transition thumbnail is the size of ↵Winson Chung2014-09-071-7/+6
| | | | | | | | | | | | the header. (Bug. 16987565) Change-Id: Ic104876c5fe16997eca00e0a2b3d8644c927120c
* | Work on issue #17357238: Recents is often slow if not used in a whileDianne Hackborn2014-09-053-103/+133
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new activity attribute, resumeWhilePausing, that allows an activity specifying it to immediately start running without waiting for the previous activity to pause. The recents activity is updated to use this. The implementation of this is ultimately fairly simple -- if we are in the path of resuming such an activity, and find that we first need to pause the existing activity, then within the activity manager we do the regular pause flow but act like it has immediately finished pausing right then so that we can immediately go on to the resume. To make this clean, we tell the activity when asking it to pause that it should not come back and tell us it is done, because we aren't in any way waiting for it. One potentially important change I needed to make here is the pause callback no longer provides the saved persistent state, because we now can't count on that callback happening. I don't think there was really any utility in this anyway -- all modern apps will have their save state flow happen as part of stopping, not pausing, so we'll only capture that saved state when the stop is reported back anyway. And since we do send the saved state back when stopping, it would always blow away whatever we had gotten at the pause. Finally, update the documentation for AppTask.startActivity(), and fix the implementation handling that to be cleaner -- we need to deal with inTask first before getting in to "oh noes add NEW_TASK if this isn't coming from a calling activity" flow. Change-Id: Ia1da0fac90d7bdbaafdda2e34850d795ce17a39f
* Merge "Allow for event dispatching when in non-interactive states." into lmp-devMichael Wright2014-09-051-1/+1
|\
| * Allow for event dispatching when in non-interactive states.Michael Wright2014-09-041-1/+1
| | | | | | | | | | | | | | | | | | We need to allow for event dispatching in non-interactive states so that we can enable a richer set of interactions when a device is dozing (i.e. is in a low power state with an Always-on-Display). Bug: 17167296 Change-Id: I8ae0f544a8106cb91ff38c2309b8b57cbe2f2c72
* | Merge "Prevent recursion in resumeTopActivityLocked" into lmp-devCraig Mautner2014-09-051-0/+20
|\ \
| * | Prevent recursion in resumeTopActivityLockedCraig Mautner2014-09-041-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing recursion in resumeTopActivityLocked() finally caused a problem by attempting to pause the same activity twice. By preventing the recursion with this change we no longer face that problem. Fixes bug 17260463. Change-Id: I0954614fc1a7dc0eeeef9335c1b973a42a7fc345
* | | Merge "Fix issue #17175312: Calendar crashed when tapping on the event ↵Dianne Hackborn2014-09-041-1/+1
|\ \ \ | |/ / |/| | | | | notification" into lmp-dev
| * | Fix issue #17175312: Calendar crashed when tapping on the event notificationDianne Hackborn2014-09-041-1/+1
| | | | | | | | | | | | | | | | | | mActivities can be null. Change-Id: I9cc1a08d19d2c38a4ebaaf0ed2168cfbeeaf3b51
* | | Merge "Add Configuration changes to UsageStats" into lmp-devAdam Lesinski2014-09-041-2/+1
|\ \ \
| * | | Add Configuration changes to UsageStatsAdam Lesinski2014-09-041-2/+1
| | | | | | | | | | | | | | | | | | | | Bug:17354208 Change-Id: I9b2f595e51b656607e30e798926cfb7e25134944
* | | | Merge ""Back" with translucent window now sets ActivityOptions." into lmp-devGeorge Mount2014-09-041-1/+1
|\ \ \ \
| * | | | "Back" with translucent window now sets ActivityOptions.George Mount2014-09-041-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Also made convertToTranslucent set the canvas opacity. Bug 16215650 Change-Id: Id4325eaed34cda1269d874f239aeb5f6f82c959f
* | | | Merge "Add lock task checking to moving tasks to back" into lmp-devJason Monk2014-09-031-4/+16
|\ \ \ \
| * | | | Add lock task checking to moving tasks to backJason Monk2014-09-031-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chrome seems to use this method of moving itself to the back on back presses, causing it to escape lock task mode. Bug: 17365048 Change-Id: I2e8bc614f771951ed96cfc36f9789d12b1742e70
* | | | | Merge "Unconditionally move stack to front." into lmp-devCraig Mautner2014-09-031-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Unconditionally move stack to front.Craig Mautner2014-09-031-1/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recents was depending on using moveTaskToFront() to also move the task's stack to the front. But that only works if the task is actually in the stack because moveTaskToFront() doesn't do the stack movement if the task is no longer in the stack. This change calls ActivityStack.moveToFront() in addition to moveTaskToFront(). Fixes bug 17361027. Also logs callingUid when starting an activity. Change-Id: I023f956bafae00f45c58757ff5707ce520f02b55
* | | | Merge "Enforce permissions on start/stopLockTaskModeOnCurrent" into lmp-devJason Monk2014-09-031-2/+4
|\ \ \ \
| * | | | Enforce permissions on start/stopLockTaskModeOnCurrentJason Monk2014-09-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17308601 Change-Id: If3c941e206236023108a55360a627d24ca8ba608
* | | | | Add more slow execution logs.Dianne Hackborn2014-09-031-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This time *without* mixing in an bunch of unintentional reverts! Change-Id: Iab4cb9eb6d475d9fe5ebe16e9ea4be24c6f312e8
* | | | | Merge "Revert "And yet more logging for slow execution."" into lmp-devDianne Hackborn2014-09-031-37/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "And yet more logging for slow execution."Dianne Hackborn2014-09-031-37/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 113390ac113083884b6f498424b3f6afa2df4ebc. Change-Id: I16fdb08f83ad31c10d943862bae639f622542339
* | | | | Merge "And yet more logging for slow execution." into lmp-devDianne Hackborn2014-09-021-19/+37
|\ \ \ \ \ | |/ / / /
| * | | | And yet more logging for slow execution.Dianne Hackborn2014-09-021-19/+37
| | |/ / | |/| | | | | | | | | | Change-Id: Idd485d3b4339e22a38fd688cbd435818ca38d233
* | | | Merge "Fix issue #17322903: Crash in systemUI while launching an app from ↵Dianne Hackborn2014-09-021-7/+17
|\ \ \ \ | |/ / / |/| | | | | | | recents tab" into lmp-dev
| * | | Fix issue #17322903: Crash in systemUI while launching an app from recents tabDianne Hackborn2014-08-291-7/+17
| | |/ | |/| | | | | | | | | | | | | | | | We now do sane things when adding a NEW_TASK to a task that already has activities in it. Change-Id: I965d6d44f9523e6199b1d90293f61ae5b8c352a4
* | | Merge "Make it possible to remove current user" into lmp-devAmith Yamasani2014-09-021-3/+11
|\ \ \
| * | | Make it possible to remove current userAmith Yamasani2014-08-291-3/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the async nature of switching users, it's not possible to switch and remove immediately. So mark the switch target user as soon as the user switch is requested, so that a remove will proceed without failing at stopUserLocked(). Also, fix a similar problem with deleting the current guest and switching to a new guest. It was attempting to remove the current user which will result in a failed stopping of the user. Added a way to mark the current guest for deletion so that a new one can be created, switched to and the old one deleted. If runtime fails, old guest is already marked for deletion and will be cleaned up on restart. Bug: 17321533 Change-Id: I4be0fb956227e0bb95588b5b1f2867fb1e655c0d
* | | Merge "Update window always on convertTo/FromTranslucent" into lmp-devGeorge Mount2014-09-021-10/+8
|\ \ \ | |/ / |/| |
| * | Update window always on convertTo/FromTranslucentCraig Mautner2014-08-271-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we would only update the window if the activity's translucency was changed. That meant that if the window was opaque for a translucent activity, transitioning to translucent would not change the window to translucent. This change forces the window to follow the convertToTranslucent and convertFromTranslucent calls. Also fix for setting background on enter and exit transitions. Partial fix for 16215650. Change-Id: I86ea68e4bbf604d0cc60cc6e34bf8090199525d6
* | | Merge "More debug for issue #17310019: pause when launching settings" into ↵Dianne Hackborn2014-08-291-0/+20
|\ \ \ | | | | | | | | | | | | lmp-dev
| * | | More debug for issue #17310019: pause when launching settingsDianne Hackborn2014-08-291-0/+20
| | |/ | |/| | | | | | | | | | | | | Dang, I missed a lot of opportunities to log! Change-Id: I566597269fe73b0f798df4f00ad26d062021081d
* | | Merge "Fix issue #17329066: Crash in ActivityManager" into lmp-devDianne Hackborn2014-08-291-1/+1
|\ \ \
| * | | Fix issue #17329066: Crash in ActivityManagerDianne Hackborn2014-08-291-1/+1
| |/ / | | | | | | | | | Change-Id: Ib59b7a8d65b3abece82bc58897e21600af4d73f5
* | | Fix issue #17329290: NPE during ContentProviderRecord.dump()Dianne Hackborn2014-08-291-2/+10
|/ / | | | | | | | | | | Don't NPE. Change-Id: I5e59583e97b969b1739fc39a1520bd1930302313
* | Debug issue #17310019: pause when launching settingsDianne Hackborn2014-08-282-0/+29
| | | | | | | | | | | | Let's log! Change-Id: Icaf42d46aff6e74ee5fc98611dd77083a5d5052e
* | Merge "Fix issue #17289876: startActivityFromRecents appears to launch the ↵Dianne Hackborn2014-08-281-27/+69
|\ \ | | | | | | | | | wrong task" into lmp-dev
| * | Fix issue #17289876: startActivityFromRecents appears to launch the wrong taskDianne Hackborn2014-08-281-27/+69
| |/ | | | | | | | | | | | | | | | | | | | | | | It would be good to actually bring the task to the front. Also, make the flow when inTask is provided better match what happens when we go looking for a task on our own. And this includes another fix that was supposed to be part of a different change but I forgot this class is part of the framework project now. Change-Id: I3cf05f2e585c0fd7a0dbb7c7cf9fb1655764dd93
* | Merge "Change API to return thumbnail size instead of individual dimensions. ↵Winson Chung2014-08-282-18/+16
|\ \ | | | | | | | | | (Bug 17295512)" into lmp-dev
| * | Change API to return thumbnail size instead of individual dimensions. (Bug ↵Winson Chung2014-08-282-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | 17295512) - Fixing issue where we were pulling the thumbnail dimensions too early in AMS. (Bug 17286904) - Simplifying the Recents code between start & configuration change Change-Id: I6d667cbf37b844939e5fc466da613bb78ca05082
* | | Merge "Fix issue #16953886: History and batterystats checkin summary..." ↵Dianne Hackborn2014-08-281-0/+4
|\ \ \ | |/ / |/| | | | | into lmp-dev
| * | Fix issue #16953886: History and batterystats checkin summary...Dianne Hackborn2014-08-271-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | ...start timestamps are in 1970s Look for the wall clock time being very small, and try to update it to a better value if we see one. Also handle time change events to update the current time we a re tracking. Change-Id: Ifbae2b8c43ab5baa75ee4f672a752a542e23b52d
generated by cgit v1.1 at 2024-09-10 14:58:34 +0000