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

Browse Source 
Change-Id: I73c40d9c7bbe6f891736461921a03b6292d44bf9
This commit is contained in:
TreeHugger Robot
2020-04-07 20:05:13 +00:00
committed by Automerger Merge Worker
parent 7ebc330848 54225dfc65
commit 0595a58503
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());
}
} }
} }