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

Commit ad73e362 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5 

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

Change-Id: I1e18b1b6c51ea0bb4c9db9623259161a75781f29
parents 3ae93956 fa8d51d5

keystore/java/android/security/KeyStore2.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.security; 
import android.annotation.NonNull;

import android.compat.annotation.ChangeId;

import android.compat.annotation.Disabled;

import android.os.Binder;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceSpecificException;
@@ -140,6 +141,7 @@ public class KeyStore2 { 
        if (mBinder == null || retryLookup) {

            mBinder = IKeystoreService.Stub.asInterface(ServiceManager

                    .getService(KEYSTORE2_SERVICE_NAME));

            Binder.allowBlocking(mBinder.asBinder());

        }

        return mBinder;

    }

keystore/java/android/security/KeyStoreOperation.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.security; 


import android.annotation.NonNull;

import android.hardware.security.keymint.KeyParameter;

import android.os.Binder;

import android.os.RemoteException;

import android.os.ServiceSpecificException;

import android.security.keymaster.KeymasterDefs;
@@ -39,6 +40,7 @@ public class KeyStoreOperation { 
            Long challenge,

            KeyParameter[] parameters

    ) {

        Binder.allowBlocking(operation.asBinder());

        this.mOperation = operation;

        this.mChallenge = challenge;

        this.mParameters = parameters;

keystore/java/android/security/KeyStoreSecurityLevel.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.security; 
import android.annotation.NonNull;

import android.app.compat.CompatChanges;

import android.hardware.security.keymint.KeyParameter;

import android.os.Binder;

import android.os.RemoteException;

import android.os.ServiceSpecificException;

import android.security.keystore.BackendBusyException;
@@ -45,6 +46,7 @@ public class KeyStoreSecurityLevel { 
    private final IKeystoreSecurityLevel mSecurityLevel;



    public KeyStoreSecurityLevel(IKeystoreSecurityLevel securityLevel) {

        Binder.allowBlocking(securityLevel.asBinder());

        this.mSecurityLevel = securityLevel;

    }