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

2021-03-29 17:02:31 +00:00
parent 9cff99d059 f3064ba0b3
commit 5fdf93fc9d
1 changed files with 3 additions and 1 deletions
--- a/keystore/java/android/security/KeyStore2.java
+++ b/keystore/java/android/security/KeyStore2.java
@@ -125,6 +125,8 @@ public class KeyStore2 {
        }
    }

+    private static final String KEYSTORE2_SERVICE_NAME =
+            "android.system.keystore2.IKeystoreService/default";

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