diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-11 11:20:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-11 11:20:11 +0000 |
| commit | 721f75ec5a4a435a0b9bdf6bc02883e70cc39dac (patch) | |
| tree | 77b4bd674b52c9e256b86b3c6240011935d7d6c2 | |
| parent | ffdc8928ac9f96470eb48522ffc498e4b9b530d6 (diff) | |
| parent | 7160506468dfa6d69eb298e83e41fe9b3e13997e (diff) | |
Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance"
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | keystore/java/android/security/AndroidKeyStoreMaintenance.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index 22246f2f4e3c..39c80132345e 100644 --- a/Android.bp +++ b/Android.bp @@ -525,7 +525,7 @@ java_library { "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", diff --git a/keystore/java/android/security/AndroidKeyStoreMaintenance.java b/keystore/java/android/security/AndroidKeyStoreMaintenance.java index ed789f03f9ba..55015696ff47 100644 --- a/keystore/java/android/security/AndroidKeyStoreMaintenance.java +++ b/keystore/java/android/security/AndroidKeyStoreMaintenance.java @@ -20,7 +20,7 @@ import android.annotation.NonNull; 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 class AndroidKeyStoreMaintenance { 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")); } /** |