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

Commit 1c5ee613 authored by Brian C. Young's avatar Brian C. Young Committed by Shawn Willden
Browse files

Allow CTS tests to access more from KeyProtection 

Add @TestApi to allow CTS tests to use that call.
Encryption and decryption are reversed in some documentation.

Test: CtsKeystoreTestCases
Bug: 77596526
Change-Id: Ifaf8b3fa0e231eef256451a2514219fff1b16699
parent 26f00b9d

api/test-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -707,6 +707,14 @@ package android.security.keystore { 
    field public static final int ID_TYPE_SERIAL = 1; // 0x1

  }



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

    method public long getBoundToSpecificSecureUserId();

  }



  public static final class KeyProtection.Builder {

    method public android.security.keystore.KeyProtection.Builder setBoundToSpecificSecureUserId(long);

  }



}



package android.service.autofill {

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

+2 −2
Original line number Diff line number Diff line
@@ -673,8 +673,8 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu 
    }



    /**

     * Returns {@code true} if the screen must be unlocked for this key to be used for encryption or

     * signing. Decryption and signature verification will still be available when the screen is

     * Returns {@code true} if the screen must be unlocked for this key to be used for decryption or

     * signing. Encryption and signature verification will still be available when the screen is

     * locked.

     *

     * @see Builder#setUnlockedDeviceRequired(boolean)

keystore/java/android/security/keystore/KeyProtection.java

+5 −2
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;
@@ -496,6 +497,7 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs { 
     * @see KeymasterUtils#addUserAuthArgs

     * @hide

     */

    @TestApi

    public long getBoundToSpecificSecureUserId() {

        return mBoundToSecureUserId;

    }
@@ -511,8 +513,8 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs { 
    }



    /**

     * Returns {@code true} if the screen must be unlocked for this key to be used for encryption or

     * signing. Decryption and signature verification will still be available when the screen is

     * Returns {@code true} if the screen must be unlocked for this key to be used for decryption or

     * signing. Encryption and signature verification will still be available when the screen is

     * locked.

     *

     * @see Builder#setUnlockedDeviceRequired(boolean)
@@ -913,6 +915,7 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs { 
         * @see KeyProtection#getBoundToSpecificSecureUserId()

         * @hide

         */

        @TestApi

        public Builder setBoundToSpecificSecureUserId(long secureUserId) {

            mBoundToSecureUserId = secureUserId;

            return this;