diff --git a/power/aidl/vts/Android.bp b/power/aidl/vts/Android.bp index eccd872716..ea398ac6b2 100644 --- a/power/aidl/vts/Android.bp +++ b/power/aidl/vts/Android.bp @@ -32,7 +32,7 @@ cc_test { "libbinder_ndk", ], static_libs: [ - "android.hardware.power-V2-ndk", + "android.hardware.power-V3-ndk", ], test_suites: [ "vts", diff --git a/power/aidl/vts/VtsHalPowerTargetTest.cpp b/power/aidl/vts/VtsHalPowerTargetTest.cpp index ffab66c312..e0ca87f496 100644 --- a/power/aidl/vts/VtsHalPowerTargetTest.cpp +++ b/power/aidl/vts/VtsHalPowerTargetTest.cpp @@ -201,10 +201,7 @@ TEST_P(PowerAidl, updateAndReportDurations) { // FIXED_PERFORMANCE mode is required for all devices which ship on Android 11 // or later TEST_P(PowerAidl, hasFixedPerformance) { - auto apiLevel = GetUintProperty("ro.product.first_api_level", 0); - if (apiLevel == 0) { - apiLevel = GetUintProperty("ro.build.version.sdk", 0); - } + auto apiLevel = GetUintProperty("ro.vendor.api_level", 0); ASSERT_NE(apiLevel, 0); if (apiLevel >= 30) { @@ -214,6 +211,19 @@ TEST_P(PowerAidl, hasFixedPerformance) { } } +// GAME_LOADING mode is required for all devices which ship on Android T +// or later +TEST_P(PowerAidl, hasGameLoading) { + auto apiLevel = GetUintProperty("ro.vendor.api_level", 0); + ASSERT_NE(apiLevel, 0); + + if (apiLevel >= 33) { + bool supported; + ASSERT_TRUE(power->isModeSupported(Mode::GAME_LOADING, &supported).isOk()); + ASSERT_TRUE(supported); + } +} + GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(PowerAidl); INSTANTIATE_TEST_SUITE_P(Power, PowerAidl, testing::ValuesIn(::android::getAidlHalInstanceNames(IPower::descriptor)),