diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-04-28 17:12:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-28 17:12:47 +0000 |
| commit | 354b70f7d209e79e4442d4b70fb1d849163eae3d (patch) | |
| tree | 7ef68fd0de5076d446dc0ff20a8dc45531341a3e /services | |
| parent | e658285baf86a223ad369851d1fc5ebacad7b408 (diff) | |
| parent | 85b90abdf942f7347a829b9f4c576b02345d2579 (diff) | |
| download | frameworks_base-354b70f7d209e79e4442d4b70fb1d849163eae3d.zip frameworks_base-354b70f7d209e79e4442d4b70fb1d849163eae3d.tar.gz frameworks_base-354b70f7d209e79e4442d4b70fb1d849163eae3d.tar.bz2 | |
Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev
Diffstat (limited to 'services')
3 files changed, 5 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 33f915f..62d70d2 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -1331,6 +1331,9 @@ final class ActivityStack { } } catch(RemoteException e) { } + if (r.state == ActivityState.RESUMED) { + noStackActivityResumed = false; + } } else { // This activity is not currently visible, but is running. // Tell it to become visible. diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index c5bdbb0..d7542ee 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2345,7 +2345,6 @@ public class WindowManagerService extends IWindowManager.Stub boolean reportNewConfig = false; WindowState attachedWindow = null; - WindowState win = null; long origId; final int type = attrs.type; @@ -2482,7 +2481,7 @@ public class WindowManagerService extends IWindowManager.Stub addToken = true; } - win = new WindowState(this, session, client, token, + WindowState win = new WindowState(this, session, client, token, attachedWindow, appOp[0], seq, attrs, viewVisibility, displayContent); if (win.mDeathRecipient == null) { // Client has apparently died, so there is no reason to diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index ec70879..c50974c 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1709,7 +1709,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { pw.println(mWallpaperDisplayOffsetY); } if (mDrawLock != null) { - pw.println("mDrawLock=" + mDrawLock); + pw.print(prefix); pw.println("mDrawLock=" + mDrawLock); } } |