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

Commit 1f74bad9 authored by Craig Mautner's avatar Craig Mautner
Browse files

Check for null DO NOT MERGE 

Fixes bug 15129354.

Change-Id: I88865c021a024ab94e44dc71f09f8325a79e0775
parent 026596b9

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

+4 −3
Original line number Diff line number Diff line
@@ -3189,6 +3189,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            WindowState win = atoken.findMainWindow();

            Rect containingFrame = new Rect(0, 0, width, height);

            Rect contentInsets = new Rect();

            boolean isFullScreen = true;

            if (win != null) {

                if (win.mContainingFrame != null) {

                    containingFrame.set(win.mContainingFrame);
@@ -3196,11 +3197,11 @@ public class WindowManagerService extends IWindowManager.Stub 
                if (win.mContentInsets != null) {

                    contentInsets.set(win.mContentInsets);

                }

                isFullScreen =

                        ((win.mSystemUiVisibility & SYSTEM_UI_FLAGS_LAYOUT_STABLE_FULLSCREEN) ==

                                SYSTEM_UI_FLAGS_LAYOUT_STABLE_FULLSCREEN);

            }



            boolean isFullScreen =

                    ((win.mSystemUiVisibility & SYSTEM_UI_FLAGS_LAYOUT_STABLE_FULLSCREEN)

                            == SYSTEM_UI_FLAGS_LAYOUT_STABLE_FULLSCREEN);

            Animation a = mAppTransition.loadAnimation(lp, transit, enter, width, height,

                    mCurConfiguration.orientation, containingFrame, contentInsets, isFullScreen);

            if (a != null) {