Merge "Allow user without a password to clear credentials" into qt-dev (0c6ead9e) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/security/CredentialStorage.java

+13 −7

Original line number	Diff line number	Diff line
		@@ -242,15 +242,21 @@ public final class CredentialStorage extends FragmentActivity {

		@Override
		public void onDismiss(DialogInterface dialog) {
		if (mResetConfirmed) {
		mResetConfirmed = false;
		if (confirmKeyGuard(CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST)) {
		// will return password value via onActivityResult
		if (!mResetConfirmed) {
		finish();
		return;
		}
		}

		mResetConfirmed = false;
		if (!mUtils.isSecure(UserHandle.myUserId())) {
		// This task will call finish() in the end.
		new ResetKeyStoreAndKeyChain().execute();
		} else if (!confirmKeyGuard(CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST)) {
		Log.w(TAG, "Failed to launch credential confirmation for a secure user.");
		finish();
		}
		// Confirmation result will be handled in onActivityResult if needed.
		}
		}

		/**