commit bf88ecf8794faf6022c6df82c015161811e8104c
author Eric Biggers <ebiggers@google.com> Tue Jan 30 02:08:41 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 30 02:08:41 2024 +0000
tree a6c2c64023148f53948147c50196b16a53733ff3
parent b2bce97cce6e70d8497bfa71bcc00ab0ae383e16
parent cf3d77ac7e4b553e5a949543a4d9020ac36bfa0c

Merge "Remove StorageManager#isUserKeyUnlocked()" into main

core/api/test-current.txt

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index ab770af..4402576 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -2583,7 +2583,6 @@
     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

diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index eb1db3e..4c3f330 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -1669,12 +1669,6 @@
         }
     }
 
-    /** {@hide} */
-    @TestApi
-    public static boolean isUserKeyUnlocked(int userId) {
-        return isCeStorageUnlocked(userId);
-    }
-
     /**
      * Returns true if the user's credential-encrypted (CE) storage is unlocked.
      *