diff options
| author | 2023-09-28 22:20:18 +0000 | |
|---|---|---|
| committer | 2023-11-21 20:23:46 +0000 | |
| commit | 98f96b7dab0454eb99d8560497f34948033d3ef3 (patch) | |
| tree | 257c4d17742b8dab89c92281e0f5dc0447f04eb5 | |
| parent | 0cb5a08bb4d32354fb438108a28a33d2cda7bde2 (diff) | |
StorageManager: remove old isFileEncrypted* methods
StorageManager#isFileEncryptedNativeOnly() and
StorageManager#isFileEncryptedNativeOrEmulated() are no longer used,
except for @UnsupportedAppUsage. However, a clear public API equivalent
exists: StorageManager#isEncrypted(File) can be used to check whether
the device is encrypted. Since Android 13, file encryption is the only
supported encryption type. Therefore, these methods can be removed.
Bug: 232458753
Test: presubmit
Change-Id: I3f3707aa54821269201b05a0cdd2a2cdf23b0c9a
| -rw-r--r-- | core/java/android/os/storage/StorageManager.java | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 8e72e13051b0..fa42fed75e56 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -1729,23 +1729,6 @@ public class StorageManager { return RoSystemProperties.CRYPTO_FILE_ENCRYPTED; } - /** {@hide} - * @deprecated Use {@link #isFileEncrypted} instead, since emulated FBE is no longer supported. - */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) - @Deprecated - public static boolean isFileEncryptedNativeOnly() { - return isFileEncrypted(); - } - - /** {@hide} - * @deprecated Use {@link #isFileEncrypted} instead, since emulated FBE is no longer supported. - */ - @Deprecated - public static boolean isFileEncryptedNativeOrEmulated() { - return isFileEncrypted(); - } - /** {@hide} */ public static boolean hasAdoptable() { switch (SystemProperties.get(PROP_ADOPTABLE)) { |