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

Commit 85853292 authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Null check before access display cutout 

In the gesture pointer event listener, check the existence of display
before accessing the display cutout. When the system server crashes, the
display could become null. Accessing it will cause NPE and will
interrupt the system server restart and causing the entire device
crashes and reboot.

Test: build
Bug: 354298618
Flag: EXEMPT bugfix
Change-Id: I5444a24ba3d77d3018bc8864c2f72e7c19809962
parent ddfdfdd2

packages/SystemUI/src/com/android/systemui/statusbar/gesture/GesturePointerEventListener.kt

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ constructor(context: Context, gestureDetector: GesturePointerEventDetector) : Co 
        mSwipeDistanceThreshold =

            r.getDimensionPixelSize(R.dimen.system_gestures_distance_threshold)

        val display = DisplayManagerGlobal.getInstance().getRealDisplay(mContext.displayId)

        val displayCutout = display.cutout

        val displayCutout = display?.cutout

        if (displayCutout != null) {

            // Expand swipe start threshold such that we can catch touches that just start beyond

            // the notch area

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

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ class SystemGesturesPointerEventListener implements PointerEventListener { 


        final Display display = DisplayManagerGlobal.getInstance()

                .getRealDisplay(Display.DEFAULT_DISPLAY);

        final DisplayCutout displayCutout = display.getCutout();

        final DisplayCutout displayCutout = display != null ? display.getCutout() : null;

        if (displayCutout != null) {

            // Expand swipe start threshold such that we can catch touches that just start beyond

            // the notch area