From 7a38cf95d104c0e55b757366b184dc7409c6f41f Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 7 Apr 2020 11:14:42 -0700 Subject: [PATCH] Guard against NPE Fixes: 153106423 Test: make Change-Id: Ib50c7bc4985246d347859793ab1bf2a7a8a45016 --- .../com/android/systemui/statusbar/phone/KeyguardBouncer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java index f06cfec9480a9..82e02b47974cc 100644 --- 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()); + } } }