tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow unlocked in VTS" into rvc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2020-06-08 19:15:07 +00:00 committed by Android (Google) Code Review
commit ff07d31be0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
View file

@ -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);