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

Commit 3d782a8a authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE caused by wrong initialization order." into tm-qpr-dev am: d06bb41f 

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



Change-Id: If968524df99ffdca9d39f3f2ff7420ce56d4012a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35a42474 d06bb41f

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

+6 −3
Original line number Diff line number Diff line
@@ -2068,6 +2068,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


        launchMode = aInfo.launchMode;



        // Don't move below setActivityType since it triggers onConfigurationChange ->

        // resolveOverrideConfiguration that requires having mLetterboxUiController initialised.

        mLetterboxUiController = new LetterboxUiController(mWmService, this);

        mCameraCompatControlEnabled = mWmService.mContext.getResources()

                .getBoolean(R.bool.config_isCameraCompatControlForStretchedIssuesEnabled);



        setActivityType(_componentSpecified, _launchedFromUid, _intent, options, sourceRecord);



        immersive = (aInfo.flags & FLAG_IMMERSIVE) != 0;
@@ -2096,9 +2102,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        mPersistentState = persistentState;

        taskDescription = _taskDescription;



        mLetterboxUiController = new LetterboxUiController(mWmService, this);

        mCameraCompatControlEnabled = mWmService.mContext.getResources()

                .getBoolean(R.bool.config_isCameraCompatControlForStretchedIssuesEnabled);

        shouldDockBigOverlays = mWmService.mContext.getResources()

                .getBoolean(R.bool.config_dockBigOverlayWindows);