commit 390851dd2919f20ea303561a430e4e4c028d9366
author David Anderson <dvander@google.com> Thu Mar 03 05:05:19 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 03 05:05:19 2022 +0000
tree feeabc022680995e4ff6bf4b9589a9cf00c5299e
parent 412eacb7e18ac148ae0275d896310c22db2af9f5
parent 05ffcf2d9ced79ceab787a68fb479dafde7fec30

Merge "fs_mgr: Restrict dt fstabs to < Q devices."

fs_mgr/tests/Android.bp

diff --git a/fs_mgr/tests/Android.bp b/fs_mgr/tests/Android.bp
index 4661312..d82d566 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();
     }