summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyStore.java
diff options
context:
space:
mode:
authorMax Bires <jbires@google.com>2019-11-19 20:20:36 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-19 20:20:36 -0800
commit88b99511bdc363842835730eae73add26f04c9a8 (patch)
tree885133fbd32a5bf06b8624e68d50df139197988d /keystore/java/android/security/KeyStore.java
parentdd59b70388eed052e0bcf064562a3164ce114e36 (diff)
parentc47567db494ac60c6a0a1e8c9336e954b758f94c (diff)
Merge "Removing binder access to deprecated KeyStore function reset" am: 9eb7fcfba6 am: 0ae9cd3faa
am: c47567db49 Change-Id: I8e8d072dbf3edcb53eb32f86e0898c1bef791267
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 9991f6d2d43f..d9ed5f32cfc3 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}.
*