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 am: 2172f58763

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I075bb9325980052c7f90fb372b61c62e00765d38
This commit is contained in:
Treehugger Robot
2021-03-11 12:16:58 +00:00
committed by Automerger Merge Worker
parent e9a848ea57 2172f58763
commit 49e95446fe
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.hardware.vibrator-V1.3-java",
"android.security.apc-java", "android.security.apc-java",
"android.security.authorization-java", "android.security.authorization-java",
"android.security.usermanager-java", "android.security.maintenance-java",
"android.security.vpnprofilestore-java", "android.security.vpnprofilestore-java",
"android.system.keystore2-V1-java", "android.system.keystore2-V1-java",
"android.system.suspend.control.internal-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.annotation.Nullable;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.ServiceSpecificException; import android.os.ServiceSpecificException;
import android.security.usermanager.IKeystoreUserManager; import android.security.maintenance.IKeystoreMaintenance;
import android.system.keystore2.Domain; import android.system.keystore2.Domain;
import android.system.keystore2.ResponseCode; import android.system.keystore2.ResponseCode;
import android.util.Log; import android.util.Log;
@@ -34,9 +34,9 @@ public class AndroidKeyStoreMaintenance {
public static final int SYSTEM_ERROR = ResponseCode.SYSTEM_ERROR; public static final int SYSTEM_ERROR = ResponseCode.SYSTEM_ERROR;
private static IKeystoreUserManager getService() { private static IKeystoreMaintenance getService() {
return IKeystoreUserManager.Stub.asInterface( return IKeystoreMaintenance.Stub.asInterface(
ServiceManager.checkService("android.security.usermanager")); ServiceManager.checkService("android.security.maintenance"));
} }
/** /**