Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03bf8643 authored by Eric Biggers's avatar Eric Biggers Committed by Gerrit Code Review
Browse files

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

parents 9727fd34 98f96b7d

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

+0 −17
Original line number Diff line number Diff line
@@ -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)) {