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

Commit 015b828d authored by Tommy Chiu's avatar Tommy Chiu Committed by Automerger Merge Worker
Browse files

Correct the expection of DeviceInfo size am: 72abbbd3 

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



Change-Id: I8bdac7f84f2a4a7a7a3927a1b15be97a3da778d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a24d05e8 72abbbd3

security/keymint/support/remote_prov_utils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ ErrMsgOr<std::unique_ptr<cppbor::Map>> parseAndValidateDeviceInfo( 
            }

            // TEE IRPC instances require all entries to be present in DeviceInfo. Non-TEE instances

            // may omit `os_version`

            if (!isTeeDeviceInfo(*parsed) && (parsed->size() != kNumTeeDeviceInfoEntries ||

            if (!isTeeDeviceInfo(*parsed) && (parsed->size() != kNumTeeDeviceInfoEntries &&

                                              parsed->size() != kNumTeeDeviceInfoEntries - 1)) {

                error += fmt::format(

                        "Err: Incorrect number of device info entries. Expected {} or {} but got "