diff options
| -rw-r--r-- | services/core/java/com/android/server/am/TaskRecord.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/TaskStack.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 3fc6846b812f..02cf87ae82b1 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -1277,7 +1277,7 @@ final class TaskRecord { } final Configuration serviceConfig = mService.mConfiguration; - mOverrideConfig = new Configuration(serviceConfig); + mOverrideConfig = new Configuration(Configuration.EMPTY); // TODO(multidisplay): Update Dp to that of display stack is on. final float density = serviceConfig.densityDpi * DisplayMetrics.DENSITY_DEFAULT_SCALE; mOverrideConfig.screenWidthDp = diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 8085f13ca7f9..04ab5440ea6e 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -515,10 +515,11 @@ public class TaskStack implements DimLayer.DimLayerUser { for (int i = 0; i < count; i++) { final TaskStack otherStack = mService.mStackIdToStack.valueAt(i); final int otherStackId = otherStack.mStackId; - if (StackId.isResizeableByDockedStack(otherStackId)) { + if (StackId.isResizeableByDockedStack(otherStackId) + && !otherStack.mBounds.equals(bounds)) { mService.mH.sendMessage( mService.mH.obtainMessage(RESIZE_STACK, otherStackId, - 1 /*allowResizeInDockedMode*/, bounds)); + 1 /*allowResizeInDockedMode*/, fullscreen ? null : bounds)); } } } |