commit 8a4a11f913373697d9406904c736b5058604a188
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 08 16:24:15 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 08 16:24:15 2023 +0000
tree 168bb781e02f0e841eb5fc94c5e4c1433f2d0b57
parent 5b8f7c5e8dec02305e8d36ae090ad307bebc9673
parent 72bbad0463095e3b7d37ad1c90d9dc50aaa99c7a

Merge "Revert^2 "Use vendor api level instead of sdk version"" into main

treble/vintf/VtsNoHidl.cpp

diff --git a/treble/vintf/VtsNoHidl.cpp b/treble/vintf/VtsNoHidl.cpp
index 58258d2..dc0569b 100644
--- a/treble/vintf/VtsNoHidl.cpp
+++ b/treble/vintf/VtsNoHidl.cpp
@@ -20,6 +20,8 @@
 #include <gmock/gmock.h>
 #include <hidl/ServiceManagement.h>
 
+#define __ANDROID_VENDOR_API_24Q2__ 202404
+
 namespace android {
 namespace vintf {
 namespace testing {
@@ -44,13 +46,13 @@
   int maxNumberOfHidlHals = 0;
   if (apiLevel == __ANDROID_API_U__) {
     maxNumberOfHidlHals = kMaxNumberOfHidlHalsU;
-  } else if (apiLevel == __ANDROID_API_V__) {
+  } else if (apiLevel == __ANDROID_VENDOR_API_24Q2__) {
     maxNumberOfHidlHals = kMaxNumberOfHidlHalsV;
   } else {
     // TODO(232439834) We can remove this once kMaxNumberOfHidlHalsV is 0.
-    GTEST_FAIL() << "Unexpected Android API version (" << apiLevel
+    GTEST_FAIL() << "Unexpected Android vendor API level (" << apiLevel
                  << "). Must be either " << __ANDROID_API_U__ << " or "
-                 << __ANDROID_API_V__;
+                 << __ANDROID_VENDOR_API_24Q2__;
   }
   sp<hidl::manager::V1_0::IServiceManager> sm =
       ::android::hardware::defaultServiceManager();

treble/vintf/libvts_vintf_test_common/common.cpp

diff --git a/treble/vintf/libvts_vintf_test_common/common.cpp b/treble/vintf/libvts_vintf_test_common/common.cpp
index c615903..7653a7a 100644
--- a/treble/vintf/libvts_vintf_test_common/common.cpp
+++ b/treble/vintf/libvts_vintf_test_common/common.cpp
@@ -47,8 +47,9 @@
         {31, Level::S},
         {32, Level::S},
         {33, Level::T},
-        {34, Level::U},  // subject to change, placeholder value
-        {35, Level::V},  // subject to change, placeholder value
+        {34, Level::U},
+        // Starting from 2024Q2, vendor api level has YYYYMM format.
+        {202404, Level::V},
     }};
 
 android::base::Result<Level> GetFcmVersionFromApiLevel(uint64_t api_level) {