Merge "Return GK_PW_HANDLE after remote LSKF verification." into udc-dev (cd7123e0) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics/BiometricEnrollActivity.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,11 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
		if (BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {
		mGkPwHandle = BiometricUtils.getGatekeeperPasswordHandle(getIntent());
		}
		} else if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
		if (BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {
		mGkPwHandle = BiometricUtils.getGatekeeperPasswordHandle(getIntent());
		}

		}

		if (savedInstanceState != null) {

src/com/android/settings/password/ChooseLockSettingsHelper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -350,7 +350,7 @@ public final class ChooseLockSettingsHelper {
		Utils.enforceSameOwner(mActivity, mUserId);
		}

		if (mExternal && mReturnCredentials) {
		if (mExternal && mReturnCredentials && !mRemoteLockscreenValidation) {
		throw new IllegalArgumentException("External and ReturnCredentials specified. "
		+ " External callers should never be allowed to receive credentials in"
		+ " onActivityResult");

src/com/android/settings/password/ConfirmDeviceCredentialActivity.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -235,12 +235,15 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
		.setRemoteLockscreenValidationSession(remoteLockscreenValidationSession)
		.setRemoteLockscreenValidationServiceComponent(
		remoteLockscreenValidationServiceComponent)
		.setRequestGatekeeperPasswordHandle(true)
		.setReturnCredentials(true) // returns only password handle.
		.setHeader(mTitle) // Show the title in the header location
		.setDescription(mDetails)
		.setCheckboxLabel(checkboxLabel)
		.setAlternateButton(alternateButton)
		.setExternal(true)
		.show();
		return;
		} else if (isEffectiveUserManagedProfile && isInternalActivity()) {
		mCredentialMode = CREDENTIAL_MANAGED;
		if (isBiometricAllowed(effectiveUserId, mUserId)) {

src/com/android/settings/password/ConfirmLockPassword.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -26,6 +26,10 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROF
		import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PIN_REQUIRED;
		import static android.app.admin.DevicePolicyResources.UNDEFINED;

		import static com.android.settings.biometrics.GatekeeperPasswordProvider.containsGatekeeperPasswordHandle;
		import static com.android.settings.biometrics.GatekeeperPasswordProvider.getGatekeeperPasswordHandle;
		import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE;

		import android.annotation.Nullable;
		import android.app.KeyguardManager;
		import android.app.RemoteLockscreenValidationResult;
		@@ -614,7 +618,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
		saveAndFinishWorker.setListener(this);
		saveAndFinishWorker.start(
		mLockPatternUtils,
		/* requestGatekeeperPassword= */ false,
		/* requestGatekeeperPassword= */ true,
		mDeviceCredentialGuess,
		/* currentCredential= */ null,
		mEffectiveUserId);
		@@ -705,8 +709,14 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
		if (mDeviceCredentialGuess != null) {
		mDeviceCredentialGuess.zeroize();
		}

		Intent result = new Intent();
		if (mRemoteValidation && containsGatekeeperPasswordHandle(resultData)) {
		result.putExtra(EXTRA_KEY_GK_PW_HANDLE, getGatekeeperPasswordHandle(resultData));
		}

		mGlifLayout.setProgressBarShown(false);
		mCredentialCheckResultTracker.setResult(/* matched= */ true, new Intent(),
		mCredentialCheckResultTracker.setResult(/* matched= */ true, result,
		/* timeoutMs= */ 0, mEffectiveUserId);
		}
		}

src/com/android/settings/password/ConfirmLockPattern.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,10 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROF
		import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PATTERN_REQUIRED;
		import static android.app.admin.DevicePolicyResources.UNDEFINED;

		import static com.android.settings.biometrics.GatekeeperPasswordProvider.containsGatekeeperPasswordHandle;
		import static com.android.settings.biometrics.GatekeeperPasswordProvider.getGatekeeperPasswordHandle;
		import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE;

		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		import android.app.Activity;
		@@ -627,7 +631,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
		saveAndFinishWorker.setListener(this);
		saveAndFinishWorker.start(
		mLockPatternUtils,
		/* requestGatekeeperPassword= */ false,
		/* requestGatekeeperPassword= */ true,
		mDeviceCredentialGuess,
		/* currentCredential= */ null,
		mEffectiveUserId);
		@@ -732,8 +736,14 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
		if (mDeviceCredentialGuess != null) {
		mDeviceCredentialGuess.zeroize();
		}

		Intent result = new Intent();
		if (mRemoteValidation && containsGatekeeperPasswordHandle(resultData)) {
		result.putExtra(EXTRA_KEY_GK_PW_HANDLE, getGatekeeperPasswordHandle(resultData));
		}

		mGlifLayout.setProgressBarShown(false);
		mCredentialCheckResultTracker.setResult(/* matched= */ true, new Intent(),
		mCredentialCheckResultTracker.setResult(/* matched= */ true, result,
		/* timeoutMs= */ 0, mEffectiveUserId);
		}
		}