Use vendor.api_level for kernel version requirements The vendor api level is what is used for VSR requirements. Test: atest vts_gki_compliance_test Bug: 326154405 (cherry picked from https://android-review.googlesource.com/q/commit:37d6a81b822ca605e23bc38627342c0976dfe244) Merged-In: If936de9f144ebdf6e90d4f36626192ffdfeb46af Change-Id: If936de9f144ebdf6e90d4f36626192ffdfeb46af
diff --git a/avb/kernel_version_test.cpp b/avb/kernel_version_test.cpp index ba18c06..0803c39 100644 --- a/avb/kernel_version_test.cpp +++ b/avb/kernel_version_test.cpp
@@ -357,21 +357,17 @@ "SystemVendorTest.KernelCompatibility"; } - // Use board API level, not vendor API level, to ignore - // ro.product.first_api_level. ro.vendor.api_level is considering - // the ro.product.api_level which could potentially yield a lower api_level - // than the ro.board.{first_,}api_level. - auto board_api_level = GetBoardApiLevel(); - ASSERT_TRUE(board_api_level.has_value()) + auto vendor_api_level = GetVendorApiLevel(); + ASSERT_TRUE(vendor_api_level != 0) << "Unable to determine board API level on GRF devices"; - if (*board_api_level <= __ANDROID_API_R__) { + if (vendor_api_level <= __ANDROID_API_R__) { GTEST_SKIP() << "[VSR-3.4.1-001] does not enforce latest kernel x.y for " - << "board_api_level == " << *board_api_level << " <= R"; + << "vendor_api_level == " << vendor_api_level << " <= R"; } auto corresponding_vintf_level = - android::vintf::testing::GetFcmVersionFromApiLevel(*board_api_level); + android::vintf::testing::GetFcmVersionFromApiLevel(vendor_api_level); ASSERT_THAT(corresponding_vintf_level, Ok()); auto latest_min_lts = @@ -386,7 +382,7 @@ ASSERT_GE(kernel_version, *latest_min_lts) << "[VSR-3.4.1-001] CHIPSETs that are on GRF and are frozen on API level " - << *board_api_level << " (corresponding to VINTF level " + << vendor_api_level << " (corresponding to VINTF level " << *corresponding_vintf_level << ") must use kernel version (" << *latest_min_lts << ")+, but kernel version is " << kernel_version; }