Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4942247e authored by Michael Groover's avatar Michael Groover Committed by Gerrit Code Review
Browse files

Merge "Apply the final modifier to KeyStoreManager" into main

parents 78374643 d2143353

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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;

























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



+1
−1




























Original line number
Diff line number
Diff line








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