diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-03-29 16:12:49 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-04-02 22:35:29 +0000 |
| commit | 21cdef883cc867db55340b25d5c95e19b12ab383 (patch) | |
| tree | 93d1444ebe783f53f5f0ae2647592723b27b3fb8 /keystore/java/android/security/KeyStore2.java | |
| parent | 7deab3736bb5f3a92be8ac820096926dce2366ad (diff) | |
| parent | d1d45f856fdf68835f5b42eacecab44e6dfa8545 (diff) | |
Merge SP1A.210329.001
Change-Id: I1e21c5890b5b2e2f2855f09960bc8eec8aa922bf
Diffstat (limited to 'keystore/java/android/security/KeyStore2.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore2.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/keystore/java/android/security/KeyStore2.java b/keystore/java/android/security/KeyStore2.java index 6ac3821d0f9c..75e248e06b2b 100644 --- a/keystore/java/android/security/KeyStore2.java +++ b/keystore/java/android/security/KeyStore2.java @@ -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 |