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

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

Change-Id: I3a4362170c9462e44cc58b5d9aa3833b999325a0
This commit is contained in:
TreeHugger Robot
2020-06-08 19:21:25 +00:00
committed by Automerger Merge Worker

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