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	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ import android.view.SurfaceView;
	import android.view.ViewGroup;		import android.view.ViewGroup;

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

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

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

+1 −1

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

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

+8 −7

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

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

	@Override		@Override
	@@ -212,7 +212,8 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView>
	* @return True if the keyguard is done.		* @return True if the keyguard is done.
	*/		*/
	public boolean dismiss(int targetUserId) {		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() {		public boolean handleBackKey() {
	if (mKeyguardSecurityContainerController.getCurrentSecurityMode()		SecurityMode securityMode = mKeyguardSecurityContainerController.getCurrentSecurityMode();
	!= SecurityMode.None) {		if (securityMode != SecurityMode.None) {
	mKeyguardSecurityContainerController.dismiss(		mKeyguardSecurityContainerController.dismiss(
	false, KeyguardUpdateMonitor.getCurrentUser());		false, KeyguardUpdateMonitor.getCurrentUser(), securityMode);
	return true;		return true;
	}		}
	return false;		return false;

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

+3 −2

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

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

+1 −1

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