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

Commit 20f71c34 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I746f4136d3e4c31ba0da352c1d17fb0813ea87ec
parents 0beb125c bfe45b77

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1640,6 +1640,7 @@ package android.os.storage { 
  public class StorageManager {

    method @NonNull public static java.util.UUID convert(@NonNull String);

    method @NonNull public static String convert(@NonNull java.util.UUID);

    method public static boolean isUserKeyUnlocked(int);

  }



  public final class StorageVolume implements android.os.Parcelable {

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

+1 −0
Original line number Diff line number Diff line
@@ -1536,6 +1536,7 @@ public class StorageManager { 
    }



    /** {@hide} */

    @TestApi

    public static boolean isUserKeyUnlocked(int userId) {

        if (sStorageManager == null) {

            sStorageManager = IStorageManager.Stub