Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove KeyStoreParameter.getContext()." into mnc-dev

Browse Source
This commit is contained in:
Alex Klyubin
2015-05-26 17:57:53 +00:00
committed by Android (Google) Code Review
parent 46ed04de08 09a3b7f2ac
commit 7bf011ab92
3 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -28383,7 +28383,6 @@ package android.security {
} }
public final deprecated class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter { public final deprecated class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter {
method public android.content.Context getContext();
method public boolean isEncryptionRequired(); method public boolean isEncryptionRequired();
} }

1
api/system-current.txt
View File

@@ -30409,7 +30409,6 @@ package android.security {
} }
public final deprecated class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter { public final deprecated class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter {
method public android.content.Context getContext();
method public boolean isEncryptionRequired(); method public boolean isEncryptionRequired();
} }

18
keystore/java/android/security/KeyStoreParameter.java
View File

@@ -19,7 +19,6 @@ package android.security;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.content.Context; import android.content.Context;
import android.security.keystore.KeyGenParameterSpec;
import android.security.keystore.KeyProtection; import android.security.keystore.KeyProtection;
import java.security.KeyPairGenerator; import java.security.KeyPairGenerator;
@@ -49,27 +48,13 @@ import java.security.KeyStore.ProtectionParameter;
*/ */
@Deprecated @Deprecated
public final class KeyStoreParameter implements ProtectionParameter { public final class KeyStoreParameter implements ProtectionParameter {
private final Context mContext;
private final int mFlags; private final int mFlags;
private KeyStoreParameter( private KeyStoreParameter(
Context context,
int flags) { int flags) {
if (context == null) {
throw new IllegalArgumentException("context == null");
}
mContext = context;
mFlags = flags; mFlags = flags;
} }
/**
* Gets the Android context used for operations with this instance.
*/
public Context getContext() {
return mContext;
}
/** /**
* @hide * @hide
*/ */
@@ -115,7 +100,6 @@ public final class KeyStoreParameter implements ProtectionParameter {
*/ */
@Deprecated @Deprecated
public final static class Builder { public final static class Builder {
private final Context mContext;
private int mFlags; private int mFlags;
/** /**
@@ -128,7 +112,6 @@ public final class KeyStoreParameter implements ProtectionParameter {
if (context == null) { if (context == null) {
throw new NullPointerException("context == null"); throw new NullPointerException("context == null");
} }
mContext = context;
} }
/** /**
@@ -163,7 +146,6 @@ public final class KeyStoreParameter implements ProtectionParameter {
@NonNull @NonNull
public KeyStoreParameter build() { public KeyStoreParameter build() {
return new KeyStoreParameter( return new KeyStoreParameter(
mContext,
mFlags); mFlags);
} }
} }