Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I13644c975e38ef52635c9e55cc4ccca2b96902fd
This commit is contained in:
Treehugger Robot
2021-05-13 02:45:15 +00:00
committed by Automerger Merge Worker
parent 233682e675 ad73e362f0
commit 41d04381e9
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystore/java/android/security/KeyStore2.java
View File

@@ -19,6 +19,7 @@ package android.security;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.compat.annotation.ChangeId; import android.compat.annotation.ChangeId;
import android.compat.annotation.Disabled; import android.compat.annotation.Disabled;
import android.os.Binder;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.ServiceSpecificException; import android.os.ServiceSpecificException;
@@ -140,6 +141,7 @@ public class KeyStore2 {
if (mBinder == null || retryLookup) { if (mBinder == null || retryLookup) {
mBinder = IKeystoreService.Stub.asInterface(ServiceManager mBinder = IKeystoreService.Stub.asInterface(ServiceManager
.getService(KEYSTORE2_SERVICE_NAME)); .getService(KEYSTORE2_SERVICE_NAME));
Binder.allowBlocking(mBinder.asBinder());
} }
return mBinder; return mBinder;
} }

2
keystore/java/android/security/KeyStoreOperation.java
View File

@@ -18,6 +18,7 @@ package android.security;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.hardware.security.keymint.KeyParameter; import android.hardware.security.keymint.KeyParameter;
import android.os.Binder;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceSpecificException; import android.os.ServiceSpecificException;
import android.security.keymaster.KeymasterDefs; import android.security.keymaster.KeymasterDefs;
@@ -39,6 +40,7 @@ public class KeyStoreOperation {
Long challenge, Long challenge,
KeyParameter[] parameters KeyParameter[] parameters
) { ) {
Binder.allowBlocking(operation.asBinder());
this.mOperation = operation; this.mOperation = operation;
this.mChallenge = challenge; this.mChallenge = challenge;
this.mParameters = parameters; this.mParameters = parameters;

2
keystore/java/android/security/KeyStoreSecurityLevel.java
View File

@@ -19,6 +19,7 @@ package android.security;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.app.compat.CompatChanges; import android.app.compat.CompatChanges;
import android.hardware.security.keymint.KeyParameter; import android.hardware.security.keymint.KeyParameter;
import android.os.Binder;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceSpecificException; import android.os.ServiceSpecificException;
import android.security.keystore.BackendBusyException; import android.security.keystore.BackendBusyException;
@@ -45,6 +46,7 @@ public class KeyStoreSecurityLevel {
private final IKeystoreSecurityLevel mSecurityLevel; private final IKeystoreSecurityLevel mSecurityLevel;
public KeyStoreSecurityLevel(IKeystoreSecurityLevel securityLevel) { public KeyStoreSecurityLevel(IKeystoreSecurityLevel securityLevel) {
Binder.allowBlocking(securityLevel.asBinder());
this.mSecurityLevel = securityLevel; this.mSecurityLevel = securityLevel;
} }