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

Commit 9aeeeb86 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 am: 84f96f6a

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

Change-Id: I1ac62d24ea5a5c374a7b7ea1f80fda68543fb326
parents 0a3f55f8 84f96f6a

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

        }