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

Commit 8508c54d authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Apply the final modifier to KeyStoreManager" into main am: 4942247e am: 66c8fb09 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3341375



Change-Id: Ie904b2533fd4111b3295c1bd9eaed74473298db8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 37c57821 66c8fb09

core/api/current.txt

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