| commit | f02ac1c6feeecf504240026dbefef11518f68c10 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Sep 20 08:47:40 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 20 08:47:40 2022 +0000 |
| tree | 7ae41c7ff08bd6ff80f6bdae578e0aa6f694880f | |
| parent | 8cd08557d22978bddabbbe6c880537f3b84747ca [diff] | |
| parent | 4ea99506b045dc815474ae3b6af95040caf40290 [diff] |
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 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219605 Change-Id: I8e551a0bfaa92d457ffc4c2cac9ab1bceb70864f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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();