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

Commit 0961f914 authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Fix the NPE crash when device reboot with hide cutout set" into tm-qpr-dev am: 9d4ac70a 

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



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

libs/WindowManager/Shell/src/com/android/wm/shell/hidedisplaycutout/HideDisplayCutoutOrganizer.java

+27 −19
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ class HideDisplayCutoutOrganizer extends DisplayAreaOrganizer { 
    @VisibleForTesting

    final Rect mCurrentDisplayBounds = new Rect();

    // The default display cutout in natural orientation.

    private Insets mDefaultCutoutInsets;

    private Insets mCurrentCutoutInsets;

    private Insets mDefaultCutoutInsets = Insets.NONE;

    private Insets mCurrentCutoutInsets = Insets.NONE;

    private boolean mIsDefaultPortrait;

    private int mStatusBarHeight;

    @VisibleForTesting
@@ -77,13 +77,22 @@ class HideDisplayCutoutOrganizer extends DisplayAreaOrganizer { 


    private final DisplayController.OnDisplaysChangedListener mListener =

            new DisplayController.OnDisplaysChangedListener() {

                @Override

                public void onDisplayAdded(int displayId) {

                    onDisplayChanged(displayId);

                }



                @Override

                public void onDisplayConfigurationChanged(int displayId, Configuration newConfig) {

                    onDisplayChanged(displayId);

                }

    };



    private void onDisplayChanged(int displayId) {

        if (displayId != DEFAULT_DISPLAY) {

            return;

        }

                    DisplayLayout displayLayout =

                            mDisplayController.getDisplayLayout(DEFAULT_DISPLAY);

        final DisplayLayout displayLayout = mDisplayController.getDisplayLayout(DEFAULT_DISPLAY);

        if (displayLayout == null) {

            return;

        }
@@ -97,7 +106,6 @@ class HideDisplayCutoutOrganizer extends DisplayAreaOrganizer { 
            applyTransaction(wct, t);

        }

    }

    };



    HideDisplayCutoutOrganizer(Context context, DisplayController displayController,

            ShellExecutor mainExecutor) {