commit 27f117ee26c978950b20767ee375d2010b6a7c1f
author Mark Su <hsinen@google.com> Thu Dec 07 07:34:36 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 07 07:34:36 2023 +0000
tree a8dd80fe273b7310ff97588a557c6136ac4efb81
parent 3fcf80c25023bfe61af1d61eb147d57ef65dde81

Revert "Use vendor api level instead of sdk version"

This reverts commit 3fcf80c25023bfe61af1d61eb147d57ef65dde81.

Reason for revert: b/315246126

Change-Id: I5d963680cc12bf5d9121d7ecd2a988a3add5e039

treble/vintf/VtsNoHidl.cpp

diff --git a/treble/vintf/VtsNoHidl.cpp b/treble/vintf/VtsNoHidl.cpp
index dc0569b..58258d2 100644
--- a/treble/vintf/VtsNoHidl.cpp
+++ b/treble/vintf/VtsNoHidl.cpp
@@ -20,8 +20,6 @@
 #include <gmock/gmock.h>
 #include <hidl/ServiceManagement.h>
 
-#define __ANDROID_VENDOR_API_24Q2__ 202404
-
 namespace android {
 namespace vintf {
 namespace testing {
@@ -46,13 +44,13 @@
   int maxNumberOfHidlHals = 0;
   if (apiLevel == __ANDROID_API_U__) {
     maxNumberOfHidlHals = kMaxNumberOfHidlHalsU;
-  } else if (apiLevel == __ANDROID_VENDOR_API_24Q2__) {
+  } else if (apiLevel == __ANDROID_API_V__) {
     maxNumberOfHidlHals = kMaxNumberOfHidlHalsV;
   } else {
     // TODO(232439834) We can remove this once kMaxNumberOfHidlHalsV is 0.
-    GTEST_FAIL() << "Unexpected Android vendor API level (" << apiLevel
+    GTEST_FAIL() << "Unexpected Android API version (" << apiLevel
                  << "). Must be either " << __ANDROID_API_U__ << " or "
-                 << __ANDROID_VENDOR_API_24Q2__;
+                 << __ANDROID_API_V__;
   }
   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 7653a7a..c615903 100644
--- a/treble/vintf/libvts_vintf_test_common/common.cpp
+++ b/treble/vintf/libvts_vintf_test_common/common.cpp
@@ -47,9 +47,8 @@
         {31, Level::S},
         {32, Level::S},
         {33, Level::T},
-        {34, Level::U},
-        // Starting from 2024Q2, vendor api level has YYYYMM format.
-        {202404, Level::V},
+        {34, Level::U},  // subject to change, placeholder value
+        {35, Level::V},  // subject to change, placeholder value
     }};
 
 android::base::Result<Level> GetFcmVersionFromApiLevel(uint64_t api_level) {