Merge "Do not dismiss keyguard after SIM PUK unlock" into tm-qpr-dev (7c4684ee) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/AdminSecondaryLockScreenController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.view.SurfaceView;
		import android.view.ViewGroup;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
		import com.android.keyguard.dagger.KeyguardBouncerScope;
		import com.android.systemui.dagger.qualifiers.Main;

		@@ -208,7 +209,7 @@ public class AdminSecondaryLockScreenController {
		hide();
		if (mKeyguardCallback != null) {
		mKeyguardCallback.dismiss(/* securityVerified= */ true, userId,
		/* bypassSecondaryLockScreen= */true);
		/* bypassSecondaryLockScreen= */true, SecurityMode.Invalid);
		}
		}
		}

packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey
		if (dismissKeyguard) {
		mDismissing = true;
		mLatencyTracker.onActionStart(LatencyTracker.ACTION_LOCKSCREEN_UNLOCK);
		getKeyguardSecurityCallback().dismiss(true, userId);
		getKeyguardSecurityCallback().dismiss(true, userId, getSecurityMode());
		}
		} else {
		if (isValidPassword) {

packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView>
		Log.i(TAG, "TrustAgent dismissed Keyguard.");
		}
		mSecurityCallback.dismiss(false /* authenticated */, userId,
		/* bypassSecondaryLockScreen */ false);
		/* bypassSecondaryLockScreen */ false, SecurityMode.Invalid);
		} else {
		mViewMediatorCallback.playTrustedSound();
		}
		@@ -102,9 +102,9 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView>

		@Override
		public boolean dismiss(boolean authenticated, int targetUserId,
		boolean bypassSecondaryLockScreen) {
		boolean bypassSecondaryLockScreen, SecurityMode expectedSecurityMode) {
		return mKeyguardSecurityContainerController.showNextSecurityScreenOrFinish(
		authenticated, targetUserId, bypassSecondaryLockScreen);
		authenticated, targetUserId, bypassSecondaryLockScreen, expectedSecurityMode);
		}

		@Override
		@@ -212,7 +212,8 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView>
		* @return True if the keyguard is done.
		*/
		public boolean dismiss(int targetUserId) {
		return mSecurityCallback.dismiss(false, targetUserId, false);
		return mSecurityCallback.dismiss(false, targetUserId, false,
		getCurrentSecurityMode());
		}

		/**
		@@ -360,10 +361,10 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView>
		}

		public boolean handleBackKey() {
		if (mKeyguardSecurityContainerController.getCurrentSecurityMode()
		!= SecurityMode.None) {
		SecurityMode securityMode = mKeyguardSecurityContainerController.getCurrentSecurityMode();
		if (securityMode != SecurityMode.None) {
		mKeyguardSecurityContainerController.dismiss(
		false, KeyguardUpdateMonitor.getCurrentUser());
		false, KeyguardUpdateMonitor.getCurrentUser(), securityMode);
		return true;
		}
		return false;

packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -59,10 +59,11 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
		return false;
		}
		@Override
		public void dismiss(boolean securityVerified, int targetUserId) { }
		public void dismiss(boolean securityVerified, int targetUserId,
		SecurityMode expectedSecurityMode) { }
		@Override
		public void dismiss(boolean authenticated, int targetId,
		boolean bypassSecondaryLockScreen) { }
		boolean bypassSecondaryLockScreen, SecurityMode expectedSecurityMode) { }
		@Override
		public void onUserInput() { }
		@Override

packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -171,7 +171,7 @@ public class KeyguardPatternViewController
		if (dismissKeyguard) {
		mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Correct);
		mLatencyTracker.onActionStart(LatencyTracker.ACTION_LOCKSCREEN_UNLOCK);
		getKeyguardSecurityCallback().dismiss(true, userId);
		getKeyguardSecurityCallback().dismiss(true, userId, SecurityMode.Pattern);
		}
		} else {
		mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);