Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose isUserKeyUnlocked as a TestAPI" into sc-dev am: bfe45b77f8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13567147

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I746f4136d3e4c31ba0da352c1d17fb0813ea87ec
This commit is contained in:
Kholoud Mohamed
2021-02-22 16:01:49 +00:00
committed by Automerger Merge Worker
parent 0beb125c0d bfe45b77f8
commit 20f71c3456
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/test-current.txt
View File

@@ -1640,6 +1640,7 @@ package android.os.storage {
public class StorageManager { public class StorageManager {
method @NonNull public static java.util.UUID convert(@NonNull String); method @NonNull public static java.util.UUID convert(@NonNull String);
method @NonNull public static String convert(@NonNull java.util.UUID); method @NonNull public static String convert(@NonNull java.util.UUID);
method public static boolean isUserKeyUnlocked(int);
} }
public final class StorageVolume implements android.os.Parcelable { public final class StorageVolume implements android.os.Parcelable {

1
core/java/android/os/storage/StorageManager.java
View File

@@ -1536,6 +1536,7 @@ public class StorageManager {
} }
/** {@hide} */ /** {@hide} */
@TestApi
public static boolean isUserKeyUnlocked(int userId) { public static boolean isUserKeyUnlocked(int userId) {
if (sStorageManager == null) { if (sStorageManager == null) {
sStorageManager = IStorageManager.Stub sStorageManager = IStorageManager.Stub