Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bc15d32 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

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

Merge "Keystore 2.0: Update to canonical service name." am: 5fdf93fc am: 615236ca am: d9909763 am: dffcfd90

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

Change-Id: I56b2ae5b276be9ad1760fdd4f90e9857a91b8793
parents 24819b22 dffcfd90

keystore/java/android/security/KeyStore2.java

+3 −1
Original line number Diff line number Diff line
@@ -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;

    }