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

Commit 9f993ace authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE for checking immersive confirmation window root feature" into... 

Merge "Fix NPE for checking immersive confirmation window root feature" into sc-dev am: fa67b59b am: 7b81f8d2

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

Change-Id: Iae180fec6ecbea6d5f3f1c1cd9038419fbee1019
parents 53b26991 7b81f8d2

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

+3 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ import static android.view.WindowManagerPolicyConstants.NAV_BAR_BOTTOM; 
import static android.view.WindowManagerPolicyConstants.NAV_BAR_INVALID;

import static android.view.WindowManagerPolicyConstants.NAV_BAR_LEFT;

import static android.view.WindowManagerPolicyConstants.NAV_BAR_RIGHT;

import static android.window.DisplayAreaOrganizer.FEATURE_UNDEFINED;



import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_SCREEN_ON;

import static com.android.server.policy.PhoneWindowManager.TOAST_WINDOW_TIMEOUT;
@@ -2667,7 +2668,8 @@ public class DisplayPolicy { 
        if (oldImmersiveMode != newImmersiveMode) {

            mLastImmersiveMode = newImmersiveMode;

            // The immersive confirmation window should be attached to the immersive window root.

            final int rootDisplayAreaId = win.getRootDisplayArea().mFeatureId;

            final RootDisplayArea root = win.getRootDisplayArea();

            final int rootDisplayAreaId = root == null ? FEATURE_UNDEFINED : root.mFeatureId;

            mImmersiveModeConfirmation.immersiveModeChangedLw(rootDisplayAreaId, newImmersiveMode,

                    mService.mPolicy.isUserSetupComplete(),

                    isNavBarEmpty(disableFlags));