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

Commit c00a772d authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Do not clear activity type in clearSizeCompatMode" into tm-qpr-dev am:... 

Merge "Do not clear activity type in clearSizeCompatMode" into tm-qpr-dev am: 79ffe1cc am: be8a2737 am: ce18dfc3 am: 9c29d0fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21707652



Change-Id: I30e3c542463a8377781639497c609d9cbdc93251
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6faf132 9c29d0fc

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

+7 −1
Original line number Diff line number Diff line
@@ -8145,7 +8145,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }



        // Clear config override in #updateCompatDisplayInsets().

        onRequestedOverrideConfigurationChanged(EMPTY);

        final int activityType = getActivityType();

        final Configuration overrideConfig = getRequestedOverrideConfiguration();

        overrideConfig.unset();

        // Keep the activity type which was set when attaching to a task to prevent leaving it

        // undefined.

        overrideConfig.windowConfiguration.setActivityType(activityType);

        onRequestedOverrideConfigurationChanged(overrideConfig);

    }



    @Override