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

Commit ec018b7b authored by Eran Messeri's avatar Eran Messeri Committed by Automerger Merge Worker
Browse files

Merge "Update PM documentation for Keystore" into main am: da58b73c 

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



Change-Id: I3f1021aeb912951731c3fe50a637b9ae04d68909
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aa6a2b08 da58b73c

core/java/android/content/pm/PackageManager.java

+9 −0
Original line number Diff line number Diff line
@@ -4421,6 +4421,10 @@ public abstract class PackageManager { 
     * the Android Keystore backed by an isolated execution environment. The version indicates

     * which features are implemented in the isolated execution environment:

     * <ul>

     * <li>300: Ability to include a second IMEI in the ID attestation record, see

     * {@link android.app.admin.DevicePolicyManager#ID_TYPE_IMEI}.

     * <li>200: Hardware support for Curve 25519 (including both Ed25519 signature generation and

     * X25519 key agreement).

     * <li>100: Hardware support for ECDH (see {@link javax.crypto.KeyAgreement}) and support

     * for app-generated attestation keys (see {@link

     * android.security.keystore.KeyGenParameterSpec.Builder#setAttestKeyAlias(String)}).
@@ -4450,6 +4454,11 @@ public abstract class PackageManager { 
     * StrongBox</a>. If this feature has a version, the version number indicates which features are

     * implemented in StrongBox:

     * <ul>

     * <li>300: Ability to include a second IMEI in the ID attestation record, see

     * {@link android.app.admin.DevicePolicyManager#ID_TYPE_IMEI}.

     * <li>200: No new features for StrongBox (the Android Keystore environment backed by an

     * isolated execution environment has gained support for Curve 25519 in this version, but

     * the implementation backed by a dedicated secure processor is not expected to implement it).

     * <li>100: Hardware support for ECDH (see {@link javax.crypto.KeyAgreement}) and support

     * for app-generated attestation keys (see {@link

     * android.security.keystore.KeyGenParameterSpec.Builder#setAttestKeyAlias(String)}).