commit 9a27357ed049c03f6b36d0a9669d58c2a5efe417
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 20 09:44:20 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 20 09:44:20 2022 +0000
tree 7ae41c7ff08bd6ff80f6bdae578e0aa6f694880f
parent 5a43b4022f5779b3a431e9f4bb620d09b6a9263c
parent 4c0057431807a321bbcecadd79340d67b2fc01a0

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: 4ea99506b0 am: f02ac1c6fe am: 4c00574318

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

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

fs_mgr/libsnapshot/vts_ota_config_test.cpp

diff --git a/fs_mgr/libsnapshot/vts_ota_config_test.cpp b/fs_mgr/libsnapshot/vts_ota_config_test.cpp
old mode 100644
new mode 100755
index 02bcc34..d387eb3
--- a/fs_mgr/libsnapshot/vts_ota_config_test.cpp
+++ b/fs_mgr/libsnapshot/vts_ota_config_test.cpp
@@ -22,6 +22,9 @@
 }
 
 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));
     if (GetVsrLevel() < __ANDROID_API_T__) {
         GTEST_SKIP();