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

Change-Id: If80ba637ab99f2c298865bce7c4317adb46d6f7d
This commit is contained in:
TreeHugger Robot
2020-04-07 20:05:01 +00:00
committed by Automerger Merge Worker

View File

@@ -203,9 +203,11 @@ 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();
if (mRoot != null) {
mRoot.announceForAccessibility(mKeyguardView.getAccessibilityTitleForCurrentMode()); mRoot.announceForAccessibility(mKeyguardView.getAccessibilityTitleForCurrentMode());
} }
} }
}
/** /**
* @see #onFullyShown() * @see #onFullyShown()