summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyStore.java
diff options
context:
space:
mode:
authorMax Bires <jbires@google.com>2019-11-19 18:05:37 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-19 18:05:37 -0800
commitc47567db494ac60c6a0a1e8c9336e954b758f94c (patch)
tree9a53a80d76ea8ad1118d5af6bd1278e42c5d7dc1 /keystore/java/android/security/KeyStore.java
parent2c464dfd318004ab1c179f74c445c39f70033390 (diff)
parent0ae9cd3faa3b95d7460b96592f389c8faeecbc14 (diff)
Merge "Removing binder access to deprecated KeyStore function reset" am: 9eb7fcfba6
am: 0ae9cd3faa Change-Id: I26ddf960c24e3a8706fc32fbaabe54e772ff9e02
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
-rw-r--r--keystore/java/android/security/KeyStore.java10
1 files changed, 0 insertions, 10 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java
index b6f525042713..c0a04220cfe7 100644
--- a/keystore/java/android/security/KeyStore.java
+++ b/keystore/java/android/security/KeyStore.java
@@ -348,16 +348,6 @@ public class KeyStore {
return list(prefix, UID_SELF);
}
- @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
- public boolean reset() {
- try {
- return mBinder.reset() == NO_ERROR;
- } catch (RemoteException e) {
- Log.w(TAG, "Cannot connect to keystore", e);
- return false;
- }
- }
-
/**
* Attempt to lock the keystore for {@code user}.
*