summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rob Carr <racarr@google.com> 2016-02-01 23:11:51 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-02-01 23:11:51 +0000
commitd1a668fd9a1a7ea81a50a9bfc5a1ac188bb47dc7 (patch)
tree691a881a03cd00e378a2eea8987f1f935ac3a0a2
parenta7dbccff7791d747abf4623d670b984a7a67f505 (diff)
parent7098dbd4d6a7337c6299d386e74f5ec328348229 (diff)
Merge "Allow saving child surfaces."
-rw-r--r--services/core/java/com/android/server/wm/WindowState.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 4a9b356c2f70..465c7e0937b6 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -121,6 +121,8 @@ final class WindowState implements WindowManagerPolicy.WindowState {
static final int DRAG_RESIZE_MODE_FREEFORM = 0;
static final int DRAG_RESIZE_MODE_DOCKED_DIVIDER = 1;
+ static final boolean DEBUG_DISABLE_SAVING_SURFACES = false;
+
final WindowManagerService mService;
final WindowManagerPolicy mPolicy;
final Context mContext;
@@ -1798,10 +1800,6 @@ final class WindowState implements WindowManagerPolicy.WindowState {
return false;
}
- if (isChildWindow()) {
- return false;
- }
-
Task task = getTask();
if (task == null || task.inHomeStack()) {
// Don't save surfaces for home stack apps. These usually resume and draw
@@ -1815,6 +1813,10 @@ final class WindowState implements WindowManagerPolicy.WindowState {
return false;
}
+ if (DEBUG_DISABLE_SAVING_SURFACES) {
+ return false;
+ }
+
return mAppToken.shouldSaveSurface();
}