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

Commit 0eaa396d authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge "Note the relationship of patchlevels with keymint" am: 58686e58 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2496162



Change-Id: Ie95626886c4631bd6a950de9d2118fdf3257d820
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab8e9f1b 58686e58

security/rkp/aidl/android/hardware/security/keymint/DeviceInfo.aidl

+9 −9
Original line number Original line Diff line number Diff line
@@ -48,9 +48,9 @@ parcelable DeviceInfo { 
     *         ? "os_version" : tstr,                         ; Same as

     *         ? "os_version" : tstr,                         ; Same as

     *                                                        ; android.os.Build.VERSION.release

     *                                                        ; android.os.Build.VERSION.release

     *                                                        ; Not optional for TEE.

     *                                                        ; Not optional for TEE.

     *         "system_patch_level" : uint,                   ; YYYYMM

     *         "system_patch_level" : uint,     ; YYYYMM, must match KeyMint OS_PATCHLEVEL

     *         "boot_patch_level" : uint,                     ; YYYYMMDD

     *         "boot_patch_level" : uint,       ; YYYYMMDD, must match KeyMint BOOT_PATCHLEVEL

     *         "vendor_patch_level" : uint,                   ; YYYYMMDD

     *         "vendor_patch_level" : uint,     ; YYYYMMDD, must match KeyMint VENDOR_PATCHLEVEL

     *         "security_level" : "tee" / "strongbox",

     *         "security_level" : "tee" / "strongbox",

     *         "fused": 1 / 0,  ; 1 if secure boot is enforced for the processor that the IRPC

     *         "fused": 1 / 0,  ; 1 if secure boot is enforced for the processor that the IRPC

     *                          ; implementation is contained in. 0 otherwise.

     *                          ; implementation is contained in. 0 otherwise.
@@ -71,9 +71,9 @@ parcelable DeviceInfo { 
     *         ? "os_version" : tstr,                         ; Same as

     *         ? "os_version" : tstr,                         ; Same as

     *                                                        ; android.os.Build.VERSION.release

     *                                                        ; android.os.Build.VERSION.release

     *                                                        ; Not optional for TEE.

     *                                                        ; Not optional for TEE.

     *         "system_patch_level" : uint,                   ; YYYYMM

     *         "system_patch_level" : uint,     ; YYYYMM, must match KeyMint OS_PATCHLEVEL

     *         "boot_patch_level" : uint,                     ; YYYYMMDD

     *         "boot_patch_level" : uint,       ; YYYYMMDD, must match KeyMint BOOT_PATCHLEVEL

     *         "vendor_patch_level" : uint,                   ; YYYYMMDD

     *         "vendor_patch_level" : uint,     ; YYYYMMDD, must match KeyMint VENDOR_PATCHLEVEL

     *         "version" : 2,                                 ; The CDDL schema version.

     *         "version" : 2,                                 ; The CDDL schema version.

     *         "security_level" : "tee" / "strongbox",

     *         "security_level" : "tee" / "strongbox",

     *         "fused": 1 / 0,  ; 1 if secure boot is enforced for the processor that the IRPC

     *         "fused": 1 / 0,  ; 1 if secure boot is enforced for the processor that the IRPC
@@ -93,9 +93,9 @@ parcelable DeviceInfo { 
     *         ? "vbmeta_digest": bstr,                       ; Taken from the AVB values

     *         ? "vbmeta_digest": bstr,                       ; Taken from the AVB values

     *         ? "os_version" : tstr,                         ; Same as

     *         ? "os_version" : tstr,                         ; Same as

     *                                                        ; android.os.Build.VERSION.release

     *                                                        ; android.os.Build.VERSION.release

     *         ? "system_patch_level" : uint,                 ; YYYYMM

     *         ? "system_patch_level" : uint,     ; YYYYMM, must match KeyMint OS_PATCHLEVEL

     *         ? "boot_patch_level" : uint,                   ; YYYYMMDD

     *         ? "boot_patch_level" : uint,       ; YYYYMMDD, must match KeyMint BOOT_PATCHLEVEL

     *         ? "vendor_patch_level" : uint,                 ; YYYYMMDD

     *         ? "vendor_patch_level" : uint,     ; YYYYMMDD, must match KeyMint VENDOR_PATCHLEVEL

     *         "version" : 1,                                 ; The CDDL schema version.

     *         "version" : 1,                                 ; The CDDL schema version.

     *         "security_level" : "tee" / "strongbox"

     *         "security_level" : "tee" / "strongbox"

     *         "att_id_state": "locked" / "open",  ; Attestation IDs State. If "locked", this

     *         "att_id_state": "locked" / "open",  ; Attestation IDs State. If "locked", this