Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e546af01 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android Git Automerger
Browse files

am 7afb0d6e: am a9c7f95b: am 7bf011ab: Merge "Remove KeyStoreParameter.getContext()." into mnc-dev 

* commit '7afb0d6e':
  Remove KeyStoreParameter.getContext().
parents 11a6cf16 7afb0d6e

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -28387,7 +28387,6 @@ package android.security { 
  }















  public final deprecated class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter {













    method public android.content.Context getContext();















    method public boolean isEncryptionRequired();















  }







































api/system-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -30413,7 +30413,6 @@ package android.security {













  }





























  public final deprecated class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter {













    method public android.content.Context getContext();















    method public boolean isEncryptionRequired();















  }







































keystore/java/android/security/KeyStoreParameter.java



+0
−18




























Original line number
Diff line number
Diff line








@@ -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,27 +48,13 @@ 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















     */










@@ -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);















        }















    }