commit 03bf86430d85cc61a0a5a8ce531c8a2956b7ec47
author Eric Biggers <ebiggers@google.com> Tue Nov 28 23:25:00 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 28 23:25:00 2023 +0000
tree 9d51bd86cc0ee5ac3fbe7c0a6df99cd53a1e5057
parent 9727fd349b927900e07732ad5ab2d8d24e6dabef
parent 98f96b7dab0454eb99d8560497f34948033d3ef3

Merge "StorageManager: remove old isFileEncrypted* methods" into main

core/java/android/os/storage/StorageManager.java

diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 8e72e13..fa42fed 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -1729,23 +1729,6 @@
         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)) {