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

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

Change-Id: I9b247f6b3372f1babb19505bd67d026a279b5ec3

1 files changed, 3 insertions, 1 deletions

diff --git a/keystore/java/android/security/KeyStore2.java b/keystore/java/android/security/KeyStore2.java
index 75e248e06b2b..df579bba9dc2 100644
--- 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;
     }