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

Commit cf3d77ac authored by Eric Biggers's avatar Eric Biggers
Browse files

Remove StorageManager#isUserKeyUnlocked() 

StorageManager#isUserKeyUnlocked() is no longer used, since all callers
have switched to using StorageManager#isCeStorageUnlocked() which has a
clearer name.  Therefore, remove StorageManager#isUserKeyUnlocked().

Note that isUserKeyUnlocked() is a @TestApi and isCeStorageUnlocked()
isn't.  This is fine because no CTS tests call either method, so
@TestApi is unnecessary.  And unlike regular APIs, Test APIs may be
added/changed/removed at any time.  Of course, we can always add
@TestApi to isCeStorageUnlocked() later if it actually becomes needed.

Bug: 306204742
Test: build
Change-Id: Ibf7dcccf85bdc566941d6c401ca8ad3d19fd6fc1
parent 2452ea37

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -2582,7 +2582,6 @@ package android.os.storage { 
    method @NonNull public static String convert(@NonNull java.util.UUID);

    method @Nullable public String getCloudMediaProvider();

    method public boolean isAppIoBlocked(@NonNull java.util.UUID, int, int, int);

    method public static boolean isUserKeyUnlocked(int);

    field public static final String CACHE_RESERVE_PERCENT_HIGH_KEY = "cache_reserve_percent_high";

    field public static final String CACHE_RESERVE_PERCENT_LOW_KEY = "cache_reserve_percent_low";

    field public static final String STORAGE_THRESHOLD_PERCENT_HIGH_KEY = "storage_threshold_percent_high";

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

+0 −6
Original line number Diff line number Diff line
@@ -1669,12 +1669,6 @@ public class StorageManager { 
        }

    }



    /** {@hide} */

    @TestApi

    public static boolean isUserKeyUnlocked(int userId) {

        return isCeStorageUnlocked(userId);

    }



    /**

     * Returns true if the user's credential-encrypted (CE) storage is unlocked.

     *