Merge "Guard against NPE" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-04-07 19:55:29 +00:00
committed by Android (Google) Code Review

View File

@@ -203,7 +203,9 @@ public class KeyguardBouncer {
Log.wtf(TAG, "onFullyShown when view was null"); Log.wtf(TAG, "onFullyShown when view was null");
} else { } else {
mKeyguardView.onResume(); mKeyguardView.onResume();
mRoot.announceForAccessibility(mKeyguardView.getAccessibilityTitleForCurrentMode()); if (mRoot != null) {
mRoot.announceForAccessibility(mKeyguardView.getAccessibilityTitleForCurrentMode());
}
} }
} }