commit 2967f48f8574ce35acd6c5e4e9f7872c64f159d5
author Jim Miller <jaggies@google.com> Thu Jan 07 15:05:32 2016 -0800
committer Jim Miller <jaggies@google.com> Mon Jan 11 12:15:31 2016 -0800
tree e60fe2a72bac0bd0a37591b7fb1bbd6d71cb1938
parent 9317f8698417a45a9ad32fabcbc5b50b250d31d3

Fix problem where keyguard shows spontaneously

A recent change caused keyguard to ignore the sequence number
when calling doKeyguardLaterLocked().

It also appears we can get into a situation where multiple
requests to show keyguard are pending.  This change ensures
only the latest request gets handled.

Fixes bug 26326350

Change-Id: Ic6cba0054fe235a8838ca8c242b1840c9e8309d6

services/core/java/com/android/server/policy/PhoneWindowManager.java

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index f13d964..7033837 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -6382,6 +6382,7 @@
             if (mLockScreenTimerActive != enable) {
                 if (enable) {
                     if (localLOGV) Log.v(TAG, "setting lockscreen timer");
+                    mHandler.removeCallbacks(mScreenLockTimeout); // remove any pending requests
                     mHandler.postDelayed(mScreenLockTimeout, mLockScreenTimeout);
                 } else {
                     if (localLOGV) Log.v(TAG, "clearing lockscreen timer");