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

Commit d9d4e764 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Check whether StatusBar is initialized in... 

Merge "Check whether StatusBar is initialized in ScreenOffAnimationController." into sc-dev am: 412a2d2c

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

Change-Id: Ie8df7eda20c70f029366ffbfdaeb823dd1ea5284
parents 7b0bf9af 412a2d2c

packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ class UnlockedScreenOffAnimationController @Inject constructor( 
        // We currently draw both the light reveal scrim, and the AOD UI, in the shade. If it's

        // already expanded and showing notifications/QS, the animation looks really messy. For now,

        // disable it if the notification panel is expanded.

        if (statusBar.notificationPanelViewController.isFullyExpanded) {

        if (!this::statusBar.isInitialized ||

                statusBar.notificationPanelViewController.isFullyExpanded) {

            return false

        }