Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67de4945 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Fixed unexpected configuration change causing activity relaunch"

parents be5ec13a 3856bf7f

services/core/java/com/android/server/am/TaskRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -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 =

services/core/java/com/android/server/wm/TaskStack.java

+3 −2
Original line number Diff line number Diff line
@@ -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));

            }

        }

    }