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

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

Change-Id: I868da9acc0a5208e5e452ef6d5631f650579a3ff
This commit is contained in:
Josh Tsuji
2021-06-22 14:21:20 +00:00
committed by Automerger Merge Worker

View File

@@ -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
}