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

Commit 2966392d authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Add APIs to support granting access to Android Keystore keys" into main am: 64477772 

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



Change-Id: Id30ca9b2a5d0d9084d2c4fac4f2d4c864bde4ca2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58e13839 64477772

core/api/current.txt

+9 −0
Original line number Diff line number Diff line
@@ -10740,6 +10740,7 @@ package android.content { 
    field public static final String IPSEC_SERVICE = "ipsec";

    field public static final String JOB_SCHEDULER_SERVICE = "jobscheduler";

    field public static final String KEYGUARD_SERVICE = "keyguard";

    field @FlaggedApi("android.security.keystore_grant_api") public static final String KEYSTORE_SERVICE = "keystore";

    field public static final String LAUNCHER_APPS_SERVICE = "launcherapps";

    field @UiContext public static final String LAYOUT_INFLATER_SERVICE = "layout_inflater";

    field public static final String LOCALE_SERVICE = "locale";
@@ -39946,6 +39947,14 @@ package android.security.keystore { 
    method @NonNull public android.security.keystore.KeyProtection.Builder setUserPresenceRequired(boolean);

  }













  @FlaggedApi("android.security.keystore_grant_api") public 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;













    method public long grantKeyAccess(@NonNull String, int) throws android.security.KeyStoreException, java.security.UnrecoverableKeyException;













    method public void revokeKeyAccess(@NonNull String, int) throws android.security.KeyStoreException, java.security.UnrecoverableKeyException;













  }



























  public class SecureKeyImportUnavailableException extends java.security.ProviderException {















    ctor public SecureKeyImportUnavailableException();















    ctor public SecureKeyImportUnavailableException(String);

























core/java/android/app/SystemServiceRegistry.java



+12
−0




























Original line number
Diff line number
Diff line








@@ -223,6 +223,7 @@ import android.security.FileIntegrityManager;













import android.security.IFileIntegrityService;















import android.security.attestationverification.AttestationVerificationManager;















import android.security.attestationverification.IAttestationVerificationManagerService;













import android.security.keystore.KeyStoreManager;















import android.service.oemlock.IOemLockService;















import android.service.oemlock.OemLockManager;















import android.service.persistentdata.IPersistentDataBlockService;










@@ -1626,6 +1627,17 @@ public final class SystemServiceRegistry {













                    }















                });





























        registerService(Context.KEYSTORE_SERVICE, KeyStoreManager.class,













                new StaticServiceFetcher<KeyStoreManager>() {













                    @Override













                    public KeyStoreManager createService()













                            throws ServiceNotFoundException {













                        if (!android.security.Flags.keystoreGrantApi()) {













                            throw new ServiceNotFoundException("KeyStoreManager is not supported");













                        }













                        return KeyStoreManager.getInstance();













                    }});





























        registerService(Context.CONTACT_KEYS_SERVICE, E2eeContactKeysManager.class,















                new CachedServiceFetcher<E2eeContactKeysManager>() {















                    @Override

































core/java/android/content/Context.java



+12
−0




























Original line number
Diff line number
Diff line








@@ -4751,6 +4751,18 @@ public abstract class Context {













     */















    public static final String SENSOR_PRIVACY_SERVICE = "sensor_privacy";





























    /**













     * Use with {@link #getSystemService(String)} to retrieve a {@link













     * android.security.keystore.KeyStoreManager} for accessing













     * <a href="/privacy-and-security/keystore">Android Keystore</a>













     * functions.













     *













     * @see #getSystemService(String)













     * @see android.security.keystore.KeyStoreManager













     */













    @FlaggedApi(android.security.Flags.FLAG_KEYSTORE_GRANT_API)













    public static final String KEYSTORE_SERVICE = "keystore";





























    /**















     * Use with {@link #getSystemService(String)} to retrieve a {@link















     * android.os.storage.StorageManager} for accessing system storage

































core/java/android/security/flags.aconfig



+7
−0




























Original line number
Diff line number
Diff line








@@ -113,3 +113,10 @@ flag {













    description: "AFL feature"















    bug: "365994454"















}



























flag {













    name: "keystore_grant_api"













    namespace: "hardware_backed_security"













    description: "Feature flag for exposing KeyStore grant APIs"













    bug: "351158708"













}
























keystore/java/android/security/OWNERS



+1
−0




























Original line number
Diff line number
Diff line















per-file *.java,*.aidl = eranm@google.com,pgrafov@google.com,rubinxu@google.com













per-file KeyStoreManager.java = mpgroover@google.com