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

Change-Id: Ic4b489bc7b24fb2471c88899c95fa9408c516df1
2020-04-07 20:19:03 +00:00
parent 4583c58bda bc51daca40
commit 92bc38b46d
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());
+            }
        }
    }