Merge "Keystore 2.0: Update to canonical service name."

This commit is contained in:
Steven Moreland
2021-03-29 17:02:31 +00:00
committed by Gerrit Code Review

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;
} }