summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chong Zhang <chz@google.com> 2016-02-29 18:09:17 -0800
committer Chong Zhang <chz@google.com> 2016-02-29 18:11:42 -0800
commitd545dce4b91b6b65d71c98c39a9ed8c5540b3c34 (patch)
tree0e1d2cf7ffda42e9a6057a800e14c5dc0db9b376
parent1db8850b793109da0fc4a65ec837b1a329072b07 (diff)
Check task.isResizeable() instead of the resize mode directly
The resize mode doesn't take into account developer settings override. Bug: 27390258 Change-Id: Id161ceb4f143f982f6bec3f915655bb66949ddd3
-rw-r--r--services/core/java/com/android/server/am/ActivityStackSupervisor.java2
1 files changed, 1 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 20f8285cfee7..c7fc5e24669a 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2186,7 +2186,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
final int resizeMode = task.mResizeMode;
- if (stackId == DOCKED_STACK_ID && resizeMode == RESIZE_MODE_UNRESIZEABLE) {
+ if (stackId == DOCKED_STACK_ID && !task.isResizeable()) {
// We don't allow moving a unresizeable task to the docked stack since the docked
// stack is used for split-screen mode and will cause things like the docked divider to
// show up. We instead leave the task in its current stack or move it to the fullscreen