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

am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev

Browse Source 
* commit 'bd29b07eab3956796a7a09d7612e42e22616f458':
  Fix Keyguard drawn timeout
This commit is contained in:
Bart Sears
2015-08-13 05:39:02 +00:00
committed by Android Git Automerger
parent ac9fbe9d5c bd29b07eab
commit b7ae19905a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -5493,10 +5493,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// may happen in a future call to goToSleep. // may happen in a future call to goToSleep.
synchronized (mLock) { synchronized (mLock) {
mAwake = true; mAwake = true;
if (mKeyguardDelegate != null) {
mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);
mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT, 1000);
}
updateWakeGestureListenerLp(); updateWakeGestureListenerLp();
updateOrientationListenerLp(); updateOrientationListenerLp();
@@ -5586,6 +5582,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mScreenOnListener = screenOnListener; mScreenOnListener = screenOnListener;
if (mKeyguardDelegate != null) { if (mKeyguardDelegate != null) {
mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);
mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT, 1000);
mKeyguardDelegate.onScreenTurningOn(mKeyguardDrawnCallback); mKeyguardDelegate.onScreenTurningOn(mKeyguardDrawnCallback);
} else { } else {
if (DEBUG_WAKEUP) Slog.d(TAG, if (DEBUG_WAKEUP) Slog.d(TAG,