diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-05-13 03:00:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-13 03:00:40 +0000 |
| commit | 5ac4488fecbccb9779b51798d4f3c9c0c7e06fb3 (patch) | |
| tree | 39d2bfc54edcef7f7d94c426641a0ae7c7f3037f /keystore/java/android/security/KeyStore2.java | |
| parent | 92bc335785deffb9c9b62dea4c25639c4465c1fa (diff) | |
| parent | 41d04381e9abc0fac36f7172ca94a627a2f6f3cb (diff) | |
Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5a6 am: ad73e362f0 am: 41d04381e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706447
Change-Id: I3247db1b8db8691705a3a7856d696a84f0fd1413
Diffstat (limited to 'keystore/java/android/security/KeyStore2.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore2.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/keystore/java/android/security/KeyStore2.java b/keystore/java/android/security/KeyStore2.java index df579bba9dc2..1034847b761b 100644 --- a/keystore/java/android/security/KeyStore2.java +++ b/keystore/java/android/security/KeyStore2.java @@ -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; } |