diff options
| author | 2024-11-07 17:08:21 +0000 | |
|---|---|---|
| committer | 2024-11-07 17:08:21 +0000 | |
| commit | 4942247e7146eb138b547fa6d6394498d8bbad73 (patch) | |
| tree | 21e5db39583a501bfef87628a93cade068e128d8 | |
| parent | 78374643acbd65075c9648b40515056b78bf42c2 (diff) | |
| parent | d2143353bc37dd0cff4015186a4212d7bad7d81d (diff) | |
Merge "Apply the final modifier to KeyStoreManager" into main
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | keystore/java/android/security/keystore/KeyStoreManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 6d9fe4494220..0380dd8afae2 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -40010,7 +40010,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(); |