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

Commit d7e4bf0b authored by Shawn Willden's avatar Shawn Willden Committed by android-build-merger
Browse files

Merge "Mark CTS-tested APIs as @TestApi" into pi-dev 

am: 98831af7

Change-Id: Ia2cd2684380aca372e912af9aeda343246df924e
parents bfd7f564 98831af7

api/test-current.txt

+13 −0
Original line number Diff line number Diff line
@@ -719,6 +719,15 @@ package android.provider { 


}



package android.security {



  public class KeyStoreException extends java.lang.Exception {

    ctor public KeyStoreException(int, java.lang.String);

    method public int getErrorCode();

  }



}



package android.security.keystore {



  public abstract class AttestationUtils {
@@ -728,6 +737,10 @@ package android.security.keystore { 
    field public static final int ID_TYPE_SERIAL = 1; // 0x1

  }



  public static final class KeyGenParameterSpec.Builder {

    method public android.security.keystore.KeyGenParameterSpec.Builder setUniqueIdIncluded(boolean);

  }



  public final class KeyProtection implements java.security.KeyStore.ProtectionParameter {

    method public long getBoundToSpecificSecureUserId();

  }

keystore/java/android/security/KeyStoreException.java

+3 −0
Original line number Diff line number Diff line
@@ -16,12 +16,15 @@ 


package android.security;



import android.annotation.TestApi;



/**

 * KeyStore/keymaster exception with positive error codes coming from the KeyStore and negative

 * ones from keymaster.

 *

 * @hide

 */

@TestApi

public class KeyStoreException extends Exception {



    private final int mErrorCode;

keystore/java/android/security/keystore/KeyGenParameterSpec.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.security.keystore; 
import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.app.KeyguardManager;

import android.hardware.fingerprint.FingerprintManager;

import android.security.GateKeeper;
@@ -1227,6 +1228,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu 
         *

         * Sets whether to include a temporary unique ID field in the attestation certificate.

         */

        @TestApi

        @NonNull

        public Builder setUniqueIdIncluded(boolean uniqueIdIncluded) {

            mUniqueIdIncluded = uniqueIdIncluded;