Merge "Fix problem where keyguard shows spontaneously" (1fcd0c2e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -474,10 +474,12 @@ public class KeyguardViewMediator extends SystemUI {

		ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {

		@Override
		public void userActivity() {
		KeyguardViewMediator.this.userActivity();
		}

		@Override
		public void keyguardDone(boolean strongAuth) {
		if (!mKeyguardDonePending) {
		KeyguardViewMediator.this.keyguardDone(true /* authenticated */);
		@@ -487,6 +489,7 @@ public class KeyguardViewMediator extends SystemUI {
		}
		}

		@Override
		public void keyguardDoneDrawing() {
		mHandler.sendEmptyMessage(KEYGUARD_DONE_DRAWING);
		}
		@@ -1248,8 +1251,10 @@ public class KeyguardViewMediator extends SystemUI {
		if (DEBUG) Log.d(TAG, "received DELAYED_KEYGUARD_ACTION with seq = "
		+ sequence + ", mDelayedShowingSequence = " + mDelayedShowingSequence);
		synchronized (KeyguardViewMediator.this) {
		if (mDelayedShowingSequence == sequence) {
		doKeyguardLocked(null);
		}
		}
		} else if (DELAYED_LOCK_PROFILE_ACTION.equals(intent.getAction())) {
		int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, 0);
		if (userId != 0) {
		@@ -1698,6 +1703,7 @@ public class KeyguardViewMediator extends SystemUI {
		mHandler.removeMessages(KEYGUARD_DONE_PENDING_TIMEOUT);
		}

		@Override
		public void onBootCompleted() {
		mUpdateMonitor.dispatchBootCompleted();
		synchronized (this) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -6402,6 +6402,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		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");