diff options
| author | 2024-01-30 02:42:20 +0000 | |
|---|---|---|
| committer | 2024-01-30 02:42:20 +0000 | |
| commit | d5583d2747c76e295aed1792c97cd44f3b850ac5 (patch) | |
| tree | 673b7c7922bbc4890bbd0948f5e7021300c9342e | |
| parent | 1bac6ff243ae3a186fcf744336504431b34910ed (diff) | |
| parent | d370c4b7169450441a813789f2c73a560aa47955 (diff) | |
Merge "Remove StorageManager#isUserKeyUnlocked()" into main am: bf88ecf879 am: d370c4b716
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2852827
Change-Id: Iec4eb61a85a7952dbe29063cdc8eb3dd2d7679d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/storage/StorageManager.java | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 1fa2b5c33652..c546d7a4cfe8 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2654,7 +2654,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"; diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 9587db13ea87..3a57e84ee404 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -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. * |