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

Commit 5ab1c1eb authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by android-build-merger
Browse files

Merge "Remove deprecated RecoveryController API." into pi-dev 

am: ce70473a

Change-Id: I516537e788ea873cd85d58348897d386b8bd5a5d
parents 5563e95a ce70473a

api/system-current.txt

+0 −13
Original line number Diff line number Diff line
@@ -4353,7 +4353,6 @@ 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;
@@ -4378,25 +4377,18 @@ 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 java.security.Key getKey(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException, java.security.UnrecoverableKeyException;

    method public android.security.keystore.recovery.KeyChainSnapshot getKeyChainSnapshot() 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 java.util.Map<java.lang.String, java.security.cert.X509Certificate> getRootCertificates();

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

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

    method public void initRecoveryService(java.lang.String, byte[], byte[]) throws java.security.cert.CertificateException, 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;
@@ -4408,9 +4400,6 @@ package android.security.keystore.recovery { 
  public class RecoverySession implements java.lang.AutoCloseable {

    method public void close();

    method public java.util.Map<java.lang.String, java.security.Key> recoverKeyChainSnapshot(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 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 deprecated 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;

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

  }
@@ -4420,7 +4409,6 @@ 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);
@@ -4430,7 +4418,6 @@ 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

+31 −0
Original line number Diff line number Diff line
@@ -91,6 +91,37 @@ 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 initRecoveryService(java.lang.String, byte[]) throws java.security.cert.CertificateException, 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 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 deprecated 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;

  }



  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

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public final class KeyChainSnapshot implements Parcelable { 
     *

     * See implementation for binary key format.

     *

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

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

     */

    @Deprecated

    public @NonNull byte[] getTrustedHardwarePublicKey() {
@@ -227,7 +227,7 @@ public final class KeyChainSnapshot implements Parcelable { 
         *

         * @param publicKey The public key

         * @return This builder.

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

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

         */

        @Deprecated

        public Builder setTrustedHardwarePublicKey(byte[] publicKey) {

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

+6 −25
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ public class RecoveryController { 
    }



    /**

     * @deprecated Use {@link #initRecoveryService(String, byte[], byte[])} instead.

     * @removed Use {@link #initRecoveryService(String, byte[], byte[])} instead.

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
@@ -359,7 +359,7 @@ public class RecoveryController { 
    }



    /**

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

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

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
@@ -435,7 +435,7 @@ public class RecoveryController { 
    }



    /**

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

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

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
@@ -460,7 +460,7 @@ public class RecoveryController { 
    }



    /**

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

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

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
@@ -494,7 +494,7 @@ public class RecoveryController { 
    }



    /**

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

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

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
@@ -576,26 +576,7 @@ public class RecoveryController { 
    }



    /**

     * Deprecated.

     * Generates a AES256/GCM/NoPADDING key called {@code alias} and loads it into the recoverable

     * key store. Returns the raw material of the key.

     *

     * @param alias The key alias.

     * @param account The account associated with the key

     * @throws InternalRecoveryServiceException if an unexpected error occurred in the recovery

     *     service.

     * @throws LockScreenRequiredException if the user has not set a lock screen. This is required

     *     to generate recoverable keys, as the snapshots are encrypted using a key derived from the

     *     lock screen.

     */

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)

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

            throws InternalRecoveryServiceException, LockScreenRequiredException {

        throw new UnsupportedOperationException("Operation is not supported, use generateKey");

    }



    /**

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

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

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)

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

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class RecoverySession implements AutoCloseable { 
    }



    /**

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

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

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
@@ -109,7 +109,7 @@ public class RecoverySession implements AutoCloseable { 
    }



    /**

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

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

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
@@ -198,7 +198,7 @@ public class RecoverySession implements AutoCloseable { 
    }



    /**

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

     * @removed Use {@link #recoverKeyChainSnapshot(byte[], List)} instead.

     */

    @Deprecated

    @RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)