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

Commit 07d74c4c authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge "Prevent NullPointerException in StatusBarRoot teardown" into main

parents 6bfedcb7 c4594ada
Loading
Loading
Loading
Loading
+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() },
        )
    }
}