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

Commit d370c4b7 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Remove StorageManager#isUserKeyUnlocked()" into main am: bf88ecf8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2852827



Change-Id: If7f67924fb2108540fbb60db08584176f367fad6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 80cefa4d bf88ecf8

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -2583,7 +2583,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.

     *