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

Merge "Keystore 2.0: Update to canonical service name." am: 5fdf93fc9d

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

Change-Id: Id5fc627c5b0e28c44176ee89f4b3d6574a52b81d
This commit is contained in:
Steven Moreland
2021-03-29 17:41:26 +00:00
committed by Automerger Merge Worker
parent 433c866186 5fdf93fc9d
commit 615236ca66
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystore/java/android/security/KeyStore2.java
View File

@@ -125,6 +125,8 @@ public class KeyStore2 {
} }
} }
private static final String KEYSTORE2_SERVICE_NAME =
"android.system.keystore2.IKeystoreService/default";
private KeyStore2() { private KeyStore2() {
mBinder = null; mBinder = null;
@@ -137,7 +139,7 @@ public class KeyStore2 {
private synchronized IKeystoreService getService(boolean retryLookup) { private synchronized IKeystoreService getService(boolean retryLookup) {
if (mBinder == null || retryLookup) { if (mBinder == null || retryLookup) {
mBinder = IKeystoreService.Stub.asInterface(ServiceManager mBinder = IKeystoreService.Stub.asInterface(ServiceManager
.getService("android.system.keystore2")); .getService(KEYSTORE2_SERVICE_NAME));
} }
return mBinder; return mBinder;
} }