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

Commit 412ee58e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow unlocked in VTS" into rvc-dev am: ff07d31b 

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

Change-Id: I3a4362170c9462e44cc58b5d9aa3833b999325a0
parents 4f382fe9 ff07d31b

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -438,10 +438,10 @@ bool verify_attestation_record(const string& challenge, const string& app_id, 
            EXPECT_TRUE(device_locked);

        }



        // Check that the expected result from VBMeta matches the build type. Only a user build

        // should have AVB reporting the device is locked.

        EXPECT_NE(property_get("ro.build.type", property_value, ""), 0);

        if (!strcmp(property_value, "user")) {

        // Check that the device is locked if not debuggable, e.g., user build

        // images in CTS. For VTS, debuggable images are used to allow adb root

        // and the device is unlocked.

        if (!property_get_bool("ro.debuggable", false)) {

            EXPECT_TRUE(device_locked);

        } else {

            EXPECT_FALSE(device_locked);