Commit 4c005743 authored Sep 20, 2022 by Treehugger Robot Committed by Automerger Merge Worker Sep 20, 2022

Merge "Some device that platform base on android12 doesn't support A/B update,...

Merge "Some device that platform base on android12 doesn't support A/B update, it looks virtual A/B is also not mandatory. so this test case should check ro.vendor.api_level first." am: 4ea99506 am: f02ac1c6

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219605

Change-Id: I6aafd33cb333a7322d1e37f26b5b660ca08d1060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/libsnapshot/vts_ota_config_test.cpp

100644 → 100755

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,9 @@ static int GetVsrLevel() {
	}		}

	TEST(VAB, Enabled) {		TEST(VAB, Enabled) {
			if (!android::base::GetBoolProperty("ro.build.ab_update", false) && (GetVsrLevel() < __ANDROID_API_T__)) {
			GTEST_SKIP();
			}
	ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.enabled", false));		ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.enabled", false));
	if (GetVsrLevel() < __ANDROID_API_T__) {		if (GetVsrLevel() < __ANDROID_API_T__) {
	GTEST_SKIP();		GTEST_SKIP();