commit 05ffcf2d9ced79ceab787a68fb479dafde7fec30
author David Anderson <dvander@google.com> Fri Feb 18 15:13:58 2022 -0800
committer David Anderson <dvander@google.com> Fri Feb 18 15:22:02 2022 -0800
tree 0a8a2961bf842e87c5f65a3a655b6db46fc99197
parent 1889a41c88473384a5f4e46838bbd53f5bd9c9f9

fs_mgr: Restrict dt fstabs to < Q devices.

Bug: 214857162
Test: vts_fs_test
Change-Id: Iee3c657297fa76b1131d03a638ff7f5620cea414

fs_mgr/tests/Android.bp

diff --git a/fs_mgr/tests/Android.bp b/fs_mgr/tests/Android.bp
index 7e3924a..c97dc33 100644
--- a/fs_mgr/tests/Android.bp
+++ b/fs_mgr/tests/Android.bp
@@ -96,7 +96,7 @@
         "device-tests",
     ],
     test_options: {
-        min_shipping_api_level: 31,
+        min_shipping_api_level: 29,
     },
     require_root: true,
     auto_gen_config: true,

fs_mgr/tests/vts_fs_test.cpp

diff --git a/fs_mgr/tests/vts_fs_test.cpp b/fs_mgr/tests/vts_fs_test.cpp
index 415e67e..b5fac53 100644
--- a/fs_mgr/tests/vts_fs_test.cpp
+++ b/fs_mgr/tests/vts_fs_test.cpp
@@ -102,7 +102,7 @@
 }
 
 TEST(fs, NoDtFstab) {
-    if (GetVsrLevel() <= __ANDROID_API_S__) {
+    if (GetVsrLevel() < __ANDROID_API_Q__) {
         GTEST_SKIP();
     }