diff options
| author | 2014-09-03 17:35:18 +0000 | |
|---|---|---|
| committer | 2014-09-03 17:35:19 +0000 | |
| commit | db606d2b286d62f0ebbf57e0203775734b9bb1cb (patch) | |
| tree | 6ea6501293489cc43c10f5b51fada32b2ca8c234 | |
| parent | 66946e22b10a435108b1405061280a4463ce51c4 (diff) | |
| parent | 02a4aa261c28df2466234106d61282289276b462 (diff) | |
Merge "Unconditionally move stack to front." into lmp-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 6bc1c9ce550e..780efa1a0032 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -1262,7 +1262,7 @@ public final class ActivityStackSupervisor implements DisplayListener { if (err == ActivityManager.START_SUCCESS) { final int userId = aInfo != null ? UserHandle.getUserId(aInfo.applicationInfo.uid) : 0; Slog.i(TAG, "START u" + userId + " {" + intent.toShortString(true, true, true, false) - + "} from pid " + (callerApp != null ? callerApp.pid : callingPid) + + "} from uid " + callingUid + " on display " + (container == null ? (mFocusedStack == null ? Display.DEFAULT_DISPLAY : mFocusedStack.mDisplayId) : (container.mActivityDisplay == null ? Display.DEFAULT_DISPLAY : @@ -2075,6 +2075,7 @@ public final class ActivityStackSupervisor implements DisplayListener { } targetStack = inTask.stack; targetStack.moveTaskToFrontLocked(inTask, r, options); + targetStack.moveToFront(); mWindowManager.moveTaskToTop(inTask.taskId); // Check whether we should actually launch the new activity in to the task, |