PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Plumb setRequireConfirmation to CC"

Browse Source 
This reverts commit 56c745c38e.

Reason for revert: Adding functionality differently

Change-Id: Iadc276ff32b9bef4ea3d7dc6dc051dcfc943e134
This commit is contained in:
Kevin Chyn
2019-01-25 00:06:55 +00:00
parent 8167b65871
commit 29aaf60ace
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/password/BiometricFragment.java
View File

@@ -43,7 +43,6 @@ public class BiometricFragment extends InstrumentedFragment {
private static final String KEY_SUBTITLE = "subtitle"; private static final String KEY_SUBTITLE = "subtitle";
private static final String KEY_DESCRIPTION = "description"; private static final String KEY_DESCRIPTION = "description";
private static final String KEY_NEGATIVE_TEXT = "negative_text"; private static final String KEY_NEGATIVE_TEXT = "negative_text";
private static final String KEY_REQUIRE_CONFIRMATION = "require_confirmation";
// Re-set by the application. Should be done upon orientation changes, etc // Re-set by the application. Should be done upon orientation changes, etc
private Executor mClientExecutor; private Executor mClientExecutor;
@@ -128,7 +127,6 @@ public class BiometricFragment extends InstrumentedFragment {
.setDescription(mPromptInfo.getDescription()) .setDescription(mPromptInfo.getDescription())
.setNegativeButton(mPromptInfo.getNegativeButtonText(), mClientExecutor, .setNegativeButton(mPromptInfo.getNegativeButtonText(), mClientExecutor,
mNegativeButtonListener) mNegativeButtonListener)
.setRequireConfirmation(mPromptInfo.getRequireConfirmation())
.build(); .build();
mCancellationSignal = new CancellationSignal(); mCancellationSignal = new CancellationSignal();
@@ -173,10 +171,6 @@ public class BiometricFragment extends InstrumentedFragment {
return mBundle.getCharSequence(KEY_NEGATIVE_TEXT); return mBundle.getCharSequence(KEY_NEGATIVE_TEXT);
} }
public boolean getRequireConfirmation() {
return mBundle.getBoolean(KEY_REQUIRE_CONFIRMATION);
}
public static class Builder { public static class Builder {
private final Bundle mBundle = new Bundle(); private final Bundle mBundle = new Bundle();
@@ -200,11 +194,6 @@ public class BiometricFragment extends InstrumentedFragment {
return this; return this;
} }
public Builder setRequireConfirmation(boolean requireConfirmation) {
mBundle.putBoolean(KEY_REQUIRE_CONFIRMATION, requireConfirmation);
return this;
}
public PromptInfo build() { public PromptInfo build() {
return new PromptInfo(mBundle); return new PromptInfo(mBundle);
} }

11
src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
View File

@@ -136,10 +136,6 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
Intent intent = getIntent(); Intent intent = getIntent();
mTitle = intent.getStringExtra(KeyguardManager.EXTRA_TITLE); mTitle = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
mDetails = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION); mDetails = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
final boolean requireConfirmation =
!intent.getBooleanExtra(KeyguardManager.EXTRA_USE_IMPLICIT, true);
String alternateButton = intent.getStringExtra( String alternateButton = intent.getStringExtra(
KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL); KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL);
boolean frp = KeyguardManager.ACTION_CONFIRM_FRP_CREDENTIAL.equals(intent.getAction()); boolean frp = KeyguardManager.ACTION_CONFIRM_FRP_CREDENTIAL.equals(intent.getAction());
@@ -174,7 +170,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
&& !lockPatternUtils.isSeparateProfileChallengeEnabled(mUserId)) { && !lockPatternUtils.isSeparateProfileChallengeEnabled(mUserId)) {
mCredentialMode = CREDENTIAL_MANAGED; mCredentialMode = CREDENTIAL_MANAGED;
if (isBiometricAllowed(effectiveUserId)) { if (isBiometricAllowed(effectiveUserId)) {
showBiometricPrompt(requireConfirmation); showBiometricPrompt();
launchedBiometric = true; launchedBiometric = true;
} else { } else {
showConfirmCredentials(); showConfirmCredentials();
@@ -185,7 +181,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
if (isBiometricAllowed(effectiveUserId)) { if (isBiometricAllowed(effectiveUserId)) {
// Don't need to check if biometrics / pin/pattern/pass are enrolled. It will go to // Don't need to check if biometrics / pin/pattern/pass are enrolled. It will go to
// onAuthenticationError and do the right thing automatically. // onAuthenticationError and do the right thing automatically.
showBiometricPrompt(requireConfirmation); showBiometricPrompt();
launchedBiometric = true; launchedBiometric = true;
} else { } else {
showConfirmCredentials(); showConfirmCredentials();
@@ -246,7 +242,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
&& !isBiometricDisabledByAdmin(effectiveUserId); && !isBiometricDisabledByAdmin(effectiveUserId);
} }
private void showBiometricPrompt(boolean requireConfirmation) { private void showBiometricPrompt() {
mBiometricManager.setActiveUser(mUserId); mBiometricManager.setActiveUser(mUserId);
mBiometricFragment = (BiometricFragment) getSupportFragmentManager() mBiometricFragment = (BiometricFragment) getSupportFragmentManager()
@@ -259,7 +255,6 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
.setSubtitle(mDetails) .setSubtitle(mDetails)
.setNegativeButtonText(getResources() .setNegativeButtonText(getResources()
.getString(R.string.confirm_device_credential_use_alternate_method)) .getString(R.string.confirm_device_credential_use_alternate_method))
.setRequireConfirmation(requireConfirmation)
.build(); .build();
mBiometricFragment = BiometricFragment.newInstance(info); mBiometricFragment = BiometricFragment.newInstance(info);
newFragment = true; newFragment = true;