commit 7160506468dfa6d69eb298e83e41fe9b3e13997e
author Janis Danisevskis <jdanis@google.com> Mon Mar 08 09:17:22 2021 -0800
committer Janis Danisevskis <jdanis@google.com> Mon Mar 08 09:27:41 2021 -0800
tree 8ba891a9e764b37a10a99b59acc9b94dad9afc6d
parent 26c490456dcaff1b410225d2b963479516ecd1ab

Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance

Test: N/A
Change-Id: I252f75fc6d918029ef682c20edb3fb667ebaf8db

Android.bp

diff --git a/Android.bp b/Android.bp
index e79248e..2e630ee 100644
--- a/Android.bp
+++ b/Android.bp
@@ -525,7 +525,7 @@
         "android.hardware.vibrator-V1.3-java",
         "android.security.apc-java",
         "android.security.authorization-java",
-        "android.security.usermanager-java",
+        "android.security.maintenance-java",
         "android.security.vpnprofilestore-java",
         "android.system.keystore2-V1-java",
         "android.system.suspend.control.internal-java",

keystore/java/android/security/AndroidKeyStoreMaintenance.java

diff --git a/keystore/java/android/security/AndroidKeyStoreMaintenance.java b/keystore/java/android/security/AndroidKeyStoreMaintenance.java
index ed789f0..5501569 100644
--- a/keystore/java/android/security/AndroidKeyStoreMaintenance.java
+++ b/keystore/java/android/security/AndroidKeyStoreMaintenance.java
@@ -20,7 +20,7 @@
 import android.annotation.Nullable;
 import android.os.ServiceManager;
 import android.os.ServiceSpecificException;
-import android.security.usermanager.IKeystoreUserManager;
+import android.security.maintenance.IKeystoreMaintenance;
 import android.system.keystore2.Domain;
 import android.system.keystore2.ResponseCode;
 import android.util.Log;
@@ -34,9 +34,9 @@
 
     public static final int SYSTEM_ERROR = ResponseCode.SYSTEM_ERROR;
 
-    private static IKeystoreUserManager getService() {
-        return IKeystoreUserManager.Stub.asInterface(
-                ServiceManager.checkService("android.security.usermanager"));
+    private static IKeystoreMaintenance getService() {
+        return IKeystoreMaintenance.Stub.asInterface(
+                ServiceManager.checkService("android.security.maintenance"));
     }
 
     /**