summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--keystore/java/android/security/KeyStoreParameter.java18
3 files changed, 0 insertions, 20 deletions
diff --git a/api/current.txt b/api/current.txt
index 41acac5..15c4a9b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28383,7 +28383,6 @@ package android.security {
}
public final deprecated class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter {
- method public android.content.Context getContext();
method public boolean isEncryptionRequired();
}
diff --git a/api/system-current.txt b/api/system-current.txt
index 0f6bd2a..e7032c3 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -30409,7 +30409,6 @@ package android.security {
}
public final deprecated class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter {
- method public android.content.Context getContext();
method public boolean isEncryptionRequired();
}
diff --git a/keystore/java/android/security/KeyStoreParameter.java b/keystore/java/android/security/KeyStoreParameter.java
index 174e03f..66c87ed 100644
--- a/keystore/java/android/security/KeyStoreParameter.java
+++ b/keystore/java/android/security/KeyStoreParameter.java
@@ -19,7 +19,6 @@ package android.security;
import android.annotation.NonNull;
import android.app.KeyguardManager;
import android.content.Context;
-import android.security.keystore.KeyGenParameterSpec;
import android.security.keystore.KeyProtection;
import java.security.KeyPairGenerator;
@@ -49,28 +48,14 @@ import java.security.KeyStore.ProtectionParameter;
*/
@Deprecated
public final class KeyStoreParameter implements ProtectionParameter {
- private final Context mContext;
private final int mFlags;
private KeyStoreParameter(
- Context context,
int flags) {
- if (context == null) {
- throw new IllegalArgumentException("context == null");
- }
-
- mContext = context;
mFlags = flags;
}
/**
- * Gets the Android context used for operations with this instance.
- */
- public Context getContext() {
- return mContext;
- }
-
- /**
* @hide
*/
public int getFlags() {
@@ -115,7 +100,6 @@ public final class KeyStoreParameter implements ProtectionParameter {
*/
@Deprecated
public final static class Builder {
- private final Context mContext;
private int mFlags;
/**
@@ -128,7 +112,6 @@ public final class KeyStoreParameter implements ProtectionParameter {
if (context == null) {
throw new NullPointerException("context == null");
}
- mContext = context;
}
/**
@@ -163,7 +146,6 @@ public final class KeyStoreParameter implements ProtectionParameter {
@NonNull
public KeyStoreParameter build() {
return new KeyStoreParameter(
- mContext,
mFlags);
}
}