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

Commit 1c40bab9 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 am: 3d782a8a 

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



Change-Id: If50ebaec71da97440454d2cc203d721b905ddf52
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd0d9f03 3d782a8a

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);