Merge "Improve trust handling on dimsissing keyguard" (22458ab3) · Commits · e / os / android_frameworks_base

packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
		private boolean mIsBouncing;
		private SecurityCallback mSecurityCallback;

		private final KeyguardUpdateMonitor mUpdateMonitor;

		// Used to notify the container when something interesting happens.
		public interface SecurityCallback {
		public boolean dismiss(boolean authenticated);
		@@ -62,6 +64,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
		super(context, attrs, defStyle);
		mSecurityModel = new KeyguardSecurityModel(context);
		mLockPatternUtils = new LockPatternUtils(context);
		mUpdateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
		}

		public void setSecurityCallback(SecurityCallback callback) {
		@@ -303,7 +306,9 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
		boolean showNextSecurityScreenOrFinish(boolean authenticated) {
		if (DEBUG) Log.d(TAG, "showNextSecurityScreenOrFinish(" + authenticated + ")");
		boolean finish = false;
		if (SecurityMode.None == mCurrentSecuritySelection) {
		if (mUpdateMonitor.getUserHasTrust(mLockPatternUtils.getCurrentUser())) {
		finish = true;
		} else if (SecurityMode.None == mCurrentSecuritySelection) {
		SecurityMode securityMode = mSecurityModel.getSecurityMode();
		// Allow an alternate, such as biometric unlock
		securityMode = mSecurityModel.getAlternateFor(securityMode);

+0 −2

Original line number	Diff line number	Diff line
		@@ -83,8 +83,6 @@ public class KeyguardSecurityModel {
		} else if (simState == IccCardConstants.State.PUK_REQUIRED
		&& mLockPatternUtils.isPukUnlockScreenEnable()) {
		mode = SecurityMode.SimPuk;
		} else if (updateMonitor.getUserHasTrust(mLockPatternUtils.getCurrentUser())) {
		mode = SecurityMode.None;
		} else {
		final int security = mLockPatternUtils.getKeyguardStoredPasswordQuality();
		switch (security) {