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

Commit ff07d31b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow unlocked in VTS" into rvc-dev

parents ee71769e 307d2bba

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

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

            EXPECT_TRUE(device_locked);

        }

        }





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

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

        // should have AVB reporting the device is locked.

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

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

        // and the device is unlocked.

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

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

            EXPECT_TRUE(device_locked);

            EXPECT_TRUE(device_locked);

        } else {

        } else {

            EXPECT_FALSE(device_locked);

            EXPECT_FALSE(device_locked);