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

Change-Id: Ibb27ffdf2c97f82638e236342f40002806f350d4
2020-04-07 20:19:04 +00:00
parent 4583c58bda 0595a58503
commit 9298f26aea
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());
+            }
        }
    }