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

Commit 5240541e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove @removed from APIs still in use"

parents 46aadf67 5af199c5

api/system-current.txt

+9 −0
Original line number Diff line number Diff line
@@ -4277,6 +4277,7 @@ package android.security.keystore.recovery { 
    method public byte[] getServerParams();

    method public int getSnapshotVersion();

    method public java.security.cert.CertPath getTrustedHardwareCertPath();

    method public deprecated byte[] getTrustedHardwarePublicKey();

    method public java.util.List<android.security.keystore.recovery.WrappedApplicationKey> getWrappedApplicationKeys();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.security.keystore.recovery.KeyChainSnapshot> CREATOR;
@@ -4299,16 +4300,21 @@ package android.security.keystore.recovery { 
  public class RecoveryController {

    method public android.security.keystore.recovery.RecoverySession createRecoverySession();

    method public byte[] generateAndStoreKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;

    method public deprecated java.security.Key generateKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;

    method public java.security.Key generateKey(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;

    method public deprecated java.util.List<java.lang.String> getAliases(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public java.util.List<java.lang.String> getAliases() throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public static android.security.keystore.recovery.RecoveryController getInstance(android.content.Context);

    method public int[] getPendingRecoverySecretTypes() throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public deprecated android.security.keystore.recovery.KeyChainSnapshot getRecoveryData() throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public int[] getRecoverySecretTypes() throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public deprecated int getRecoveryStatus(java.lang.String, java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public int getRecoveryStatus(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public void initRecoveryService(java.lang.String, byte[]) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;

    method public void recoverySecretAvailable(android.security.keystore.recovery.KeyChainProtectionParams) throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public void removeKey(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public void setRecoverySecretTypes(int[]) throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public deprecated void setRecoveryStatus(java.lang.String, java.lang.String, int) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.content.pm.PackageManager.NameNotFoundException;

    method public void setRecoveryStatus(java.lang.String, int) throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public void setServerParams(byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public void setSnapshotCreatedPendingIntent(android.app.PendingIntent) throws android.security.keystore.recovery.InternalRecoveryServiceException;
@@ -4320,6 +4326,7 @@ package android.security.keystore.recovery { 
  public class RecoverySession implements java.lang.AutoCloseable {

    method public void close();

    method public java.util.Map<java.lang.String, byte[]> recoverKeys(byte[], java.util.List<android.security.keystore.recovery.WrappedApplicationKey>) throws android.security.keystore.recovery.DecryptionFailedException, android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.SessionExpiredException;

    method public deprecated byte[] start(byte[], byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;

    method public byte[] start(java.security.cert.CertPath, byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;

  }
@@ -4329,6 +4336,7 @@ package android.security.keystore.recovery { 


  public final class WrappedApplicationKey implements android.os.Parcelable {

    method public int describeContents();

    method public deprecated byte[] getAccount();

    method public java.lang.String getAlias();

    method public byte[] getEncryptedKeyMaterial();

    method public void writeToParcel(android.os.Parcel, int);
@@ -4338,6 +4346,7 @@ package android.security.keystore.recovery { 
  public static class WrappedApplicationKey.Builder {

    ctor public WrappedApplicationKey.Builder();

    method public android.security.keystore.recovery.WrappedApplicationKey build();

    method public deprecated android.security.keystore.recovery.WrappedApplicationKey.Builder setAccount(byte[]);

    method public android.security.keystore.recovery.WrappedApplicationKey.Builder setAlias(java.lang.String);

    method public android.security.keystore.recovery.WrappedApplicationKey.Builder setEncryptedKeyMaterial(byte[]);

  }

api/system-removed.txt

+0 −28
Original line number Diff line number Diff line
@@ -91,34 +91,6 @@ package android.os { 


}



package android.security.keystore.recovery {



  public final class KeyChainSnapshot implements android.os.Parcelable {

    method public deprecated byte[] getTrustedHardwarePublicKey();

  }



  public class RecoveryController {

    method public deprecated java.security.Key generateKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;

    method public deprecated java.util.List<java.lang.String> getAliases(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public deprecated android.security.keystore.recovery.KeyChainSnapshot getRecoveryData() throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public deprecated int getRecoveryStatus(java.lang.String, java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;

    method public deprecated void setRecoveryStatus(java.lang.String, java.lang.String, int) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.content.pm.PackageManager.NameNotFoundException;

  }



  public class RecoverySession implements java.lang.AutoCloseable {

    method public deprecated byte[] start(byte[], byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;

  }



  public final class WrappedApplicationKey implements android.os.Parcelable {

    method public deprecated byte[] getAccount();

  }



  public static class WrappedApplicationKey.Builder {

    method public deprecated android.security.keystore.recovery.WrappedApplicationKey.Builder setAccount(byte[]);

  }



}



package android.service.notification {



  public abstract class NotificationListenerService extends android.app.Service {

core/java/android/security/keystore/recovery/KeyChainSnapshot.java

+0 −2
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ public final class KeyChainSnapshot implements Parcelable { 
     * See implementation for binary key format.

     *

     * @deprecated Use {@link #getTrustedHardwareCertPath} instead.

     * @removed

     */

    @Deprecated

    public @NonNull byte[] getTrustedHardwarePublicKey() {
@@ -221,7 +220,6 @@ public final class KeyChainSnapshot implements Parcelable { 
         * @param publicKey The public key

         * @return This builder.

         * @deprecated Use {@link #setTrustedHardwareCertPath} instead.

         * @removed

         */

        @Deprecated

        public Builder setTrustedHardwarePublicKey(byte[] publicKey) {

core/java/android/security/keystore/recovery/RecoveryController.java

+0 −5
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ public class RecoveryController { 


    /**

     * @deprecated Use {@link #getKeyChainSnapshot()}

     * @removed

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
@@ -262,7 +261,6 @@ public class RecoveryController { 


    /**

     * @deprecated Use {@link #getAliases()}.

     * @removed

     */

    @Deprecated

    public List<String> getAliases(@Nullable String packageName)
@@ -286,7 +284,6 @@ public class RecoveryController { 


    /**

     * @deprecated Use {@link #setRecoveryStatus(String, int)}

     * @removed

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
@@ -321,7 +318,6 @@ public class RecoveryController { 


    /**

     * @deprecated Use {@link #getRecoveryStatus(String)}.

     * @removed

     */

    @Deprecated

    public int getRecoveryStatus(String packageName, String alias)
@@ -472,7 +468,6 @@ public class RecoveryController { 
    // TODO: Unhide the following APIs, generateKey(), importKey(), and getKey()

    /**

     * @deprecated Use {@link #generateKey(String)}.

     * @removed

     */

    @Deprecated

    public Key generateKey(@NonNull String alias, byte[] account)

core/java/android/security/keystore/recovery/RecoverySession.java

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ public class RecoverySession implements AutoCloseable { 


    /**

     * @deprecated Use {@link #start(CertPath, byte[], byte[], List)} instead.

     * @removed

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)