Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ia50296cc7303662115f12d18be9ac6b830859de4
This commit is contained in:
TreeHugger Robot
2020-04-07 20:19:05 +00:00
committed by Automerger Merge Worker
parent 4ca111e904 bc51daca40
commit 108ddae71a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
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());
}
} }
} }