Merge "Guard against NPE" into rvc-dev am: 54225dfc65 am: bc51daca40

Change-Id: Ia50296cc7303662115f12d18be9ac6b830859de4
2020-04-07 20:19:05 +00:00
parent 4ca111e904 bc51daca40
commit 108ddae71a
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -203,7 +203,9 @@ public class KeyguardBouncer {
            Log.wtf(TAG, "onFullyShown when view was null");
        } else {
            mKeyguardView.onResume();
-            mRoot.announceForAccessibility(mKeyguardView.getAccessibilityTitleForCurrentMode());
+            if (mRoot != null) {
+                mRoot.announceForAccessibility(mKeyguardView.getAccessibilityTitleForCurrentMode());
+            }
        }
    }