commit 5d1c5907232bd7ed41b0d28e5a775cae849c09f0
author Janis Danisevskis <jdanis@google.com> Tue Mar 23 16:25:07 2021 -0700
committer Janis Danisevskis <jdanis@google.com> Wed Mar 24 09:22:56 2021 -0700
tree c65d8e338f6f9d6c9ed19f89d0b8fdfc185f4a4f
parent d880cf50a54acd6d9d7659db42195e563a4089ed

Keystore 2.0: Disable BackendBusyException.

This disables throwing BackendBusyException in Android S. Instead we
keep the legacy behavior of spinning until an operation can be created.

Bug: 180133780
Test: N/A
Change-Id: I802148c59338b91e751498607fa903e156e40aa6

keystore/java/android/security/KeyStore2.java

diff --git a/keystore/java/android/security/KeyStore2.java b/keystore/java/android/security/KeyStore2.java
index 6ac3821..75e248e 100644
--- a/keystore/java/android/security/KeyStore2.java
+++ b/keystore/java/android/security/KeyStore2.java
@@ -18,8 +18,7 @@
 
 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 @@
      * 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