From df404a78c34f618cc75120620898982d8722eabf Mon Sep 17 00:00:00 2001
From: kholoud mohamed <kholoudm@google.com>
Date: Mon, 15 Feb 2021 18:02:13 +0000
Subject: [PATCH] Expose isUserKeyUnlocked as a TestAPI

This is needed to replace usage of the adb shell
command 'dumpsys mount' in some cts tests -to identify
if user key is locked- with a more reliable TestAPI

Bug: 173695151
Bug: 180328483
Test: N/A
Change-Id: Iebcc0080195b207f133e8d7186a098f39e137f42
---
 core/api/test-current.txt                        | 1 +
 core/java/android/os/storage/StorageManager.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index e39b2b8566619..6be783371820b 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -1614,6 +1614,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 {
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index a5d3c2acc5772..3a5426c60b24b 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -1536,6 +1536,7 @@ public class StorageManager {
     }
 
     /** {@hide} */
+    @TestApi
     public static boolean isUserKeyUnlocked(int userId) {
         if (sStorageManager == null) {
             sStorageManager = IStorageManager.Stub