From 1cc85062cf33e1f77ea01be030eba918753385ea Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 18 Mar 2022 00:10:23 +0000 Subject: [PATCH] Remove EXTRA_KEY_TYPE intent data This intent data was only used by CryptKeeperSettings, which has been removed. This is also one of the only remaining users of the StorageManager.CRYPT_TYPE_* constants which were only ever intended to be used with vold's Full Disk Encryption APIs, which have been removed. Bug: 208476087 Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password (No regressions seen; 2 tests fail both before and after.) Change-Id: Id6e2c0f5ecc79f7372b29393e66ffbd66d52d7a2 --- .../android/settings/password/ChooseLockSettingsHelper.java | 3 +-- src/com/android/settings/password/ConfirmLockPassword.java | 6 ------ src/com/android/settings/password/ConfirmLockPattern.java | 3 --- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java index 77fcbed6493..e4d52ba1d21 100644 --- a/src/com/android/settings/password/ChooseLockSettingsHelper.java +++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java @@ -44,7 +44,6 @@ public final class ChooseLockSettingsHelper { private static final String TAG = "ChooseLockSettingsHelper"; - public static final String EXTRA_KEY_TYPE = "type"; public static final String EXTRA_KEY_PASSWORD = "password"; public static final String EXTRA_KEY_RETURN_CREDENTIALS = "return_credentials"; // Force the verifyCredential path instead of checkCredential path. This will be removed @@ -191,7 +190,7 @@ public final class ChooseLockSettingsHelper { /** * @param returnCredentials if true, puts the following credentials into intent for * onActivityResult with the following keys: - * {@link #EXTRA_KEY_TYPE}, {@link #EXTRA_KEY_PASSWORD}, + * {@link #EXTRA_KEY_PASSWORD}, * {@link #EXTRA_KEY_CHALLENGE_TOKEN}, * {@link #EXTRA_KEY_GK_PW_HANDLE} * Note that if this is true, this can only be called internally. diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java index de32f139594..2c90e55c1e6 100644 --- a/src/com/android/settings/password/ConfirmLockPassword.java +++ b/src/com/android/settings/password/ConfirmLockPassword.java @@ -29,7 +29,6 @@ import android.os.Handler; import android.os.Looper; import android.os.SystemClock; import android.os.UserManager; -import android.os.storage.StorageManager; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; @@ -445,11 +444,6 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { public void onChecked(boolean matched, int timeoutMs) { mPendingLockCheck = null; if (matched && isInternalActivity() && mReturnCredentials) { - // TODO: get rid of EXTRA_KEY_TYPE, since EXTRA_KEY_PASSWORD already - // distinguishes beteween PIN and password. - intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE, - mIsAlpha ? StorageManager.CRYPT_TYPE_PASSWORD - : StorageManager.CRYPT_TYPE_PIN); intent.putExtra( ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, credential); } diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java index ec5efcfbc4e..674660eee9f 100644 --- a/src/com/android/settings/password/ConfirmLockPattern.java +++ b/src/com/android/settings/password/ConfirmLockPattern.java @@ -26,7 +26,6 @@ import android.os.Bundle; import android.os.CountDownTimer; import android.os.SystemClock; import android.os.UserManager; -import android.os.storage.StorageManager; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -506,8 +505,6 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { public void onChecked(boolean matched, int timeoutMs) { mPendingLockCheck = null; if (matched && isInternalActivity() && mReturnCredentials) { - intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE, - StorageManager.CRYPT_TYPE_PATTERN); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pattern); }