diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/storage/StorageManager.java | 32 | ||||
| -rw-r--r-- | core/java/com/android/internal/widget/LockscreenCredential.java | 21 |
2 files changed, 3 insertions, 50 deletions
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 6dd878cbfe95..134cfa12b0ee 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -286,28 +286,7 @@ public class StorageManager { /** @hide The volume is not encrypted. */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) - public static final int ENCRYPTION_STATE_NONE = - IVold.ENCRYPTION_STATE_NONE; - - /** @hide The volume has been encrypted succesfully. */ - public static final int ENCRYPTION_STATE_OK = - IVold.ENCRYPTION_STATE_OK; - - /** @hide The volume is in a bad state. */ - public static final int ENCRYPTION_STATE_ERROR_UNKNOWN = - IVold.ENCRYPTION_STATE_ERROR_UNKNOWN; - - /** @hide Encryption is incomplete */ - public static final int ENCRYPTION_STATE_ERROR_INCOMPLETE = - IVold.ENCRYPTION_STATE_ERROR_INCOMPLETE; - - /** @hide Encryption is incomplete and irrecoverable */ - public static final int ENCRYPTION_STATE_ERROR_INCONSISTENT = - IVold.ENCRYPTION_STATE_ERROR_INCONSISTENT; - - /** @hide Underlying data is corrupt */ - public static final int ENCRYPTION_STATE_ERROR_CORRUPT = - IVold.ENCRYPTION_STATE_ERROR_CORRUPT; + public static final int ENCRYPTION_STATE_NONE = 1; private static volatile IStorageManager sStorageManager = null; @@ -2893,15 +2872,10 @@ public class StorageManager { @GuardedBy("mFuseAppLoopLock") private @Nullable FuseAppLoop mFuseAppLoop = null; - /// Consts to match the password types in cryptfs.h /** @hide */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) - public static final int CRYPT_TYPE_PASSWORD = IVold.PASSWORD_TYPE_PASSWORD; + public static final int CRYPT_TYPE_PASSWORD = 0; /** @hide */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) - public static final int CRYPT_TYPE_DEFAULT = IVold.PASSWORD_TYPE_DEFAULT; - /** @hide */ - public static final int CRYPT_TYPE_PATTERN = IVold.PASSWORD_TYPE_PATTERN; - /** @hide */ - public static final int CRYPT_TYPE_PIN = IVold.PASSWORD_TYPE_PIN; + public static final int CRYPT_TYPE_DEFAULT = 1; } diff --git a/core/java/com/android/internal/widget/LockscreenCredential.java b/core/java/com/android/internal/widget/LockscreenCredential.java index 361ba958f759..1074004b4c33 100644 --- a/core/java/com/android/internal/widget/LockscreenCredential.java +++ b/core/java/com/android/internal/widget/LockscreenCredential.java @@ -175,27 +175,6 @@ public class LockscreenCredential implements Parcelable, AutoCloseable { return mCredential; } - /** - * Returns the credential type recognized by {@link StorageManager}. Can be one of - * {@link StorageManager#CRYPT_TYPE_DEFAULT}, {@link StorageManager#CRYPT_TYPE_PATTERN}, - * {@link StorageManager#CRYPT_TYPE_PIN} or {@link StorageManager#CRYPT_TYPE_PASSWORD}. - */ - public int getStorageCryptType() { - if (isNone()) { - return StorageManager.CRYPT_TYPE_DEFAULT; - } - if (isPattern()) { - return StorageManager.CRYPT_TYPE_PATTERN; - } - if (isPin()) { - return StorageManager.CRYPT_TYPE_PIN; - } - if (isPassword()) { - return StorageManager.CRYPT_TYPE_PASSWORD; - } - throw new IllegalStateException("Unhandled credential type"); - } - /** Returns whether this is an empty credential */ public boolean isNone() { ensureNotZeroized(); |