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

Merge "Make sure onScreenTurnedOn is called at power on." into jb-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-06-21 14:04:10 -07:00
committed by Android (Google) Code Review
parent cda6996408 4f5d1511b9
commit 89c6bec321
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
View File

@@ -442,9 +442,11 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
mScreenOn = true; mScreenOn = true;
mDelayedShowingSequence++; mDelayedShowingSequence++;
if (DEBUG) Log.d(TAG, "onScreenTurnedOn, seq = " + mDelayedShowingSequence); if (DEBUG) Log.d(TAG, "onScreenTurnedOn, seq = " + mDelayedShowingSequence);
if (showListener != null) {
notifyScreenOnLocked(showListener); notifyScreenOnLocked(showListener);
} }
} }
}
/** /**
* Same semantics as {@link WindowManagerPolicy#enableKeyguard}; provide * Same semantics as {@link WindowManagerPolicy#enableKeyguard}; provide

4
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -3608,6 +3608,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}); });
} }
} else { } else {
if (mKeyguardMediator != null) {
// Must set mScreenOn = true.
mKeyguardMediator.onScreenTurnedOn(null);
}
synchronized (mLock) { synchronized (mLock) {
mScreenOnFully = true; mScreenOnFully = true;
} }