summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Groover <mpgroover@google.com> 2024-11-06 19:02:23 -0600
committer Michael Groover <mpgroover@google.com> 2024-11-06 19:02:23 -0600
commitd2143353bc37dd0cff4015186a4212d7bad7d81d (patch)
tree2cfa4e2cf38beabcdb1132b8a31c829fbc00f78e
parentf098e278ed7d5c59f51ea589541d9ae80aa4386d (diff)
Apply the final modifier to KeyStoreManager
Fixes: 377489251 Test: atest KeyStoreManagerTest Change-Id: Ie3f8604d2d6bdc9eca48bf52ae38ea64578749fc
-rw-r--r--core/api/current.txt2
-rw-r--r--keystore/java/android/security/keystore/KeyStoreManager.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index 2c4c1463ba62..62dcdd7c1155 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -39947,7 +39947,7 @@ package android.security.keystore {
method @NonNull public android.security.keystore.KeyProtection.Builder setUserPresenceRequired(boolean);
}
- @FlaggedApi("android.security.keystore_grant_api") public class KeyStoreManager {
+ @FlaggedApi("android.security.keystore_grant_api") public final class KeyStoreManager {
method @NonNull public java.util.List<java.security.cert.X509Certificate> getGrantedCertificateChainFromId(long) throws android.security.keystore.KeyPermanentlyInvalidatedException, java.security.UnrecoverableKeyException;
method @NonNull public java.security.Key getGrantedKeyFromId(long) throws android.security.keystore.KeyPermanentlyInvalidatedException, java.security.UnrecoverableKeyException;
method @NonNull public java.security.KeyPair getGrantedKeyPairFromId(long) throws android.security.keystore.KeyPermanentlyInvalidatedException, java.security.UnrecoverableKeyException;
diff --git a/keystore/java/android/security/keystore/KeyStoreManager.java b/keystore/java/android/security/keystore/KeyStoreManager.java
index 197aaba4bcb5..e6091c1da8a5 100644
--- a/keystore/java/android/security/keystore/KeyStoreManager.java
+++ b/keystore/java/android/security/keystore/KeyStoreManager.java
@@ -49,7 +49,7 @@ import java.util.List;
*/
@FlaggedApi(android.security.Flags.FLAG_KEYSTORE_GRANT_API)
@SystemService(Context.KEYSTORE_SERVICE)
-public class KeyStoreManager {
+public final class KeyStoreManager {
private static final String TAG = "KeyStoreManager";
private static final Object sInstanceLock = new Object();