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

Change-Id: I73c40d9c7bbe6f891736461921a03b6292d44bf9
2020-04-07 20:05:13 +00:00
parent 7ebc330848 54225dfc65
commit 0595a58503
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());
+            }
        }
    }