From 9591090a17148d01a803072e2a93bd994d797cae Mon Sep 17 00:00:00 2001 From: Benergy Meenan Ravuri Date: Tue, 5 Jul 2022 15:50:08 +0530 Subject: [PATCH] Check userspace snapshots only for API level >= T Skip checking for userspace snapshots enabled property for API level < T as this feature is not applicable for GRF targets. Bug: 236450435 Test: vts_ota_config_test Change-Id: Ib5083f6237cdf4962aae06f166811d67cf6c385e Ignore-AOSP-First: already present in aosp/master --- fs_mgr/libsnapshot/vts_ota_config_test.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs_mgr/libsnapshot/vts_ota_config_test.cpp b/fs_mgr/libsnapshot/vts_ota_config_test.cpp index afc2d81a4..02bcc3438 100644 --- a/fs_mgr/libsnapshot/vts_ota_config_test.cpp +++ b/fs_mgr/libsnapshot/vts_ota_config_test.cpp @@ -17,7 +17,14 @@ #include #include +static int GetVsrLevel() { + return android::base::GetIntProperty("ro.vendor.api_level", -1); +} + TEST(VAB, Enabled) { ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.enabled", false)); + if (GetVsrLevel() < __ANDROID_API_T__) { + GTEST_SKIP(); + } ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.userspace.snapshots.enabled", false)); }