From d407c0be20eb23314dc6eca570b0e1614dbf6557 Mon Sep 17 00:00:00 2001 From: Max Bires Date: Tue, 11 Feb 2020 22:11:14 -0800 Subject: [PATCH] Removing errant @hide annotation There is no reason that setIsStrongBoxBacked() should be hidden for KeyProtection. Users should be expected to take advantage of using StrongBox for protecting imported keys if they choose to. Bug: 148901504 Test: doc string change Change-Id: Ie906cb75fd853d3465ff066493c6df50d68d7e9c --- api/current.txt | 1 + keystore/java/android/security/keystore/KeyProtection.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 8da13c42e75ae..01db6bddf3d86 100644 --- a/api/current.txt +++ b/api/current.txt @@ -42914,6 +42914,7 @@ package android.security.keystore { method @NonNull public android.security.keystore.KeyProtection.Builder setDigests(java.lang.String...); method @NonNull public android.security.keystore.KeyProtection.Builder setEncryptionPaddings(java.lang.String...); method @NonNull public android.security.keystore.KeyProtection.Builder setInvalidatedByBiometricEnrollment(boolean); + method @NonNull public android.security.keystore.KeyProtection.Builder setIsStrongBoxBacked(boolean); method @NonNull public android.security.keystore.KeyProtection.Builder setKeyValidityEnd(java.util.Date); method @NonNull public android.security.keystore.KeyProtection.Builder setKeyValidityForConsumptionEnd(java.util.Date); method @NonNull public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date); diff --git a/keystore/java/android/security/keystore/KeyProtection.java b/keystore/java/android/security/keystore/KeyProtection.java index 2e793dea3e05d..e1e404dcfaac5 100644 --- a/keystore/java/android/security/keystore/KeyProtection.java +++ b/keystore/java/android/security/keystore/KeyProtection.java @@ -1031,7 +1031,6 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs { /** * Sets whether this key should be protected by a StrongBox security chip. - * @hide */ @NonNull public Builder setIsStrongBoxBacked(boolean isStrongBoxBacked) {