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

Commit c4594ada authored by Alina Zaidi's avatar Alina Zaidi
Browse files

Prevent NullPointerException in StatusBarRoot teardown 

Bug: 439998615
Flag: EXEMPT minor fix
Test: EXEMPT minor fix for nullable issue
Change-Id: Idb934028d8acbe07e41ef941be46018fc066b3e9
parent 42735c3e

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt

+2 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ fun StatusBarRoot( 
        rememberViewModel("AppHandleBounds") {

            statusBarViewModel.appHandlesViewModelFactory.create(displayId)

        }

    lateinit var touchableExclusionRegionDisposableHandle: DisposableHandle

    var touchableExclusionRegionDisposableHandle: DisposableHandle? = null



    if (StatusBarPopupChips.isEnabled) {

        with(mediaHost) {
@@ -383,7 +383,7 @@ fun StatusBarRoot( 
                phoneStatusBarView

            },

            modifier = modifier,

            onRelease = { touchableExclusionRegionDisposableHandle.dispose() },

            onRelease = { touchableExclusionRegionDisposableHandle?.dispose() },

        )

    }

}