Skip to content

Commit 8eb3048

Browse files
Jim MillerAndroid Git Automerger
authored andcommitted
am 87d0366: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
* commit '87d0366d9e41a0fb1e20cc021ba391ed92fab385': Fix NPE caused by applications that try to hide keyguard while it's not showing
2 parents e97c6fa + 87d0366 commit 8eb3048

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,9 @@ private void doKeyguardLocked(Bundle options) {
881881
* Dismiss the keyguard through the security layers.
882882
*/
883883
public void dismiss() {
884-
mKeyguardViewManager.dismiss();
884+
if (mShowing && !mHidden) {
885+
mKeyguardViewManager.dismiss();
886+
}
885887
}
886888

887889
/**

0 commit comments

Comments
 (0)