commit d2143353bc37dd0cff4015186a4212d7bad7d81d
author Michael Groover <mpgroover@google.com> Wed Nov 06 19:02:23 2024 -0600
committer Michael Groover <mpgroover@google.com> Wed Nov 06 19:02:23 2024 -0600
tree 2cfa4e2cf38beabcdb1132b8a31c829fbc00f78e
parent f098e278ed7d5c59f51ea589541d9ae80aa4386d

Apply the final modifier to KeyStoreManager

Fixes: 377489251
Test: atest KeyStoreManagerTest
Change-Id: Ie3f8604d2d6bdc9eca48bf52ae38ea64578749fc

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 2c4c146..62dcdd7 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -39947,7 +39947,7 @@
     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;

keystore/java/android/security/keystore/KeyStoreManager.java

diff --git a/keystore/java/android/security/keystore/KeyStoreManager.java b/keystore/java/android/security/keystore/KeyStoreManager.java
index 197aaba..e6091c1d 100644
--- a/keystore/java/android/security/keystore/KeyStoreManager.java
+++ b/keystore/java/android/security/keystore/KeyStoreManager.java
@@ -49,7 +49,7 @@
  */
 @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();