diff options
| author | 2021-03-11 13:01:02 +0000 | |
|---|---|---|
| committer | 2021-03-11 13:01:02 +0000 | |
| commit | 2bfebf3c6978f9d78759e16dabbe5d87e074f332 (patch) | |
| tree | 5fca153fa6d41e0a28e64fe82d28181a01e489c0 | |
| parent | b3881305c541e1fb777c5cb4172521307aff218a (diff) | |
| parent | 49e95446fe2b8539c66498a6e2c9a92aad328ab1 (diff) | |
Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance" am: 721f75ec5a am: 2172f58763 am: 49e95446fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623080
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id87860c4d3741a78a5b7aa8bb67931e5c8581e59
| -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 c5980b911b17..622b2c6120bd 100644 --- a/Android.bp +++ b/Android.bp @@ -584,7 +584,7 @@ java_library { "android.hardware.vibrator-V2-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")); } /** |