Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance" am: 721f75ec5a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623080

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iecd39adff2f110571e618b679ab60a571e2237a6
This commit is contained in:
Treehugger Robot
2021-03-11 11:40:37 +00:00
committed by Automerger Merge Worker
parent 6fe70ef0c1 721f75ec5a
commit 2172f58763
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.bp
View File

@@ -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",

8
keystore/java/android/security/AndroidKeyStoreMaintenance.java
View File

@@ -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"));
}
/**