diff options
| author | Craig Mautner <cmautner@google.com> | 2014-05-05 21:03:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-05 21:03:39 +0000 |
| commit | 9bb4df3a7d9ed479f8ef10b08bbc3354a1984aab (patch) | |
| tree | db27e16f37b7feab4c858e0a801f26a714ffe66b /services | |
| parent | 6dffeb9eeba785dcf738bfabfec334a6c188d104 (diff) | |
| parent | e88097bd00d5710bbfb6c24a934743c8d6cac9cf (diff) | |
| download | frameworks_base-9bb4df3a7d9ed479f8ef10b08bbc3354a1984aab.zip frameworks_base-9bb4df3a7d9ed479f8ef10b08bbc3354a1984aab.tar.gz frameworks_base-9bb4df3a7d9ed479f8ef10b08bbc3354a1984aab.tar.bz2 | |
am e88097bd: Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev
* commit 'e88097bd00d5710bbfb6c24a934743c8d6cac9cf':
Pause and resume ActivityView when visibility changes
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 5e45917..e942afb 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -3187,9 +3187,9 @@ public final class ActivityStackSupervisor implements DisplayListener { } else { mContainerState = CONTAINER_STATE_NO_SURFACE; ((VirtualActivityDisplay) mActivityDisplay).setSurface(null); -// if (mStack.mPausingActivity == null && mStack.mResumedActivity != null) { -// mStack.startPausingLocked(false, true); -// } + if (mStack.mPausingActivity == null && mStack.mResumedActivity != null) { + mStack.startPausingLocked(false, true); + } } setSurfaceIfReady(); @@ -3199,6 +3199,11 @@ public final class ActivityStackSupervisor implements DisplayListener { } @Override + boolean isAttached() { + return mSurface != null && super.isAttached(); + } + + @Override void setDrawn() { synchronized (mService) { mDrawn = true; |