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

am f184c681: Ignore requests to hide the keyguard if we are in the process of waking up.

Browse Source 
Merge commit 'f184c68119489aa00eccba41d3babedce282518b' into eclair-mr2

* commit 'f184c68119489aa00eccba41d3babedce282518b':
  Ignore requests to hide the keyguard if we are in the process of waking up.
This commit is contained in:
Mike Lockwood
2009-10-08 17:30:06 -07:00
committed by Android Git Automerger
parent 9f7135b5b4 b4a5842157
commit a3d12ce260
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
policy/com/android/internal/policy/impl/KeyguardViewMediator.java
View File

@@ -876,6 +876,10 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
private void handleHide() {
synchronized (KeyguardViewMediator.this) {
if (DEBUG) Log.d(TAG, "handleHide");
if (mWakeAndHandOff.isHeld()) {
Log.w(TAG, "attempt to hide the keyguard while waking, ignored");
return;
}
// When we go away, tell the poewr manager to honor requests from userActivity.
mRealPowerManager.enableUserActivity(true);