Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow CTS tests to access more from KeyProtection" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-10 23:36:12 +00:00
committed by Android (Google) Code Review
parent ae42e1d0c2 1c5ee613be
commit de9d071fc1
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/test-current.txt
View File

@@ -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 {

4
keystore/java/android/security/keystore/KeyGenParameterSpec.java
View File

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

7
keystore/java/android/security/keystore/KeyProtection.java
View File

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