diff options
| author | Bart Sears <bsears@google.com> | 2015-08-13 05:32:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-13 05:32:14 +0000 |
| commit | bd29b07eab3956796a7a09d7612e42e22616f458 (patch) | |
| tree | 85bead48c576f84cb837cbf7190a4443cb81b38b /services | |
| parent | ff9912d594bc5cdc10a4a224b9a2296bac50851b (diff) | |
| parent | a4b51bc4fd4a3e40871fb8d77c2173f0c38bd162 (diff) | |
| download | frameworks_base-bd29b07eab3956796a7a09d7612e42e22616f458.zip frameworks_base-bd29b07eab3956796a7a09d7612e42e22616f458.tar.gz frameworks_base-bd29b07eab3956796a7a09d7612e42e22616f458.tar.bz2 | |
Merge "Fix Keyguard drawn timeout" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 2a79a47..489bcdb 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -5493,10 +5493,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { // may happen in a future call to goToSleep. synchronized (mLock) { mAwake = true; - if (mKeyguardDelegate != null) { - mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT); - mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT, 1000); - } updateWakeGestureListenerLp(); updateOrientationListenerLp(); @@ -5586,6 +5582,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { mScreenOnListener = screenOnListener; if (mKeyguardDelegate != null) { + mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT); + mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT, 1000); mKeyguardDelegate.onScreenTurningOn(mKeyguardDrawnCallback); } else { if (DEBUG_WAKEUP) Slog.d(TAG, |