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

Merge "Keystore 2.0: Disable BackendBusyException." am: 11c25156a2 am: 5c1c388b7e

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

Change-Id: Ic55e5ed4d434405958895616efbe8c1c60dbf3c8
This commit is contained in:
Janis Danisevskis
2021-03-24 19:52:00 +00:00
committed by Automerger Merge Worker
parent 79a4f2b785 5c1c388b7e
commit 5f23e40e43
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,7 @@ package android.security;
import android.annotation.NonNull;
import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledAfter;
import android.os.Build;
import android.compat.annotation.Disabled;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.ServiceSpecificException;
@@ -86,7 +85,7 @@ public class KeyStore2 {
* successfully conclude an operation.
*/
@ChangeId
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.R)
@Disabled // See b/180133780
static final long KEYSTORE_OPERATION_CREATION_MAY_FAIL = 169897160L;
// Never use mBinder directly, use KeyStore2.getService() instead or better yet