commit 6c1453438f10ccaa79a15fd599684e3af40b719d
author Matt Buckley <mattbuckley@google.com> Mon Dec 02 18:26:03 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 02 18:26:03 2024 +0000
tree ea97a649133c78073cfa5b832c7693d3a853d291
parent e7b812b71684c7f93c800077709f20ed3b1b9644
parent 6e8bfe7b056113c646856a3736d737f23ce5b5a0

Merge "Update VtsHalPowerTargetTest to not break" into main

power/aidl/vts/VtsHalPowerTargetTest.cpp

diff --git a/power/aidl/vts/VtsHalPowerTargetTest.cpp b/power/aidl/vts/VtsHalPowerTargetTest.cpp
index b8ed634..87797ae 100644
--- a/power/aidl/vts/VtsHalPowerTargetTest.cpp
+++ b/power/aidl/vts/VtsHalPowerTargetTest.cpp
@@ -141,13 +141,13 @@
         power = IPower::fromBinder(ndk::SpAIBinder(binder));
         auto status = power->getInterfaceVersion(&mServiceVersion);
         ASSERT_TRUE(status.isOk());
+        if (mServiceVersion >= 2) {
+            status = power->createHintSession(getpid(), getuid(), kSelfTids, 16666666L, &mSession);
+            mSessionSupport = status.isOk();
+        }
         if (mServiceVersion >= 6) {
             mSupportInfo = std::make_optional<SupportInfo>();
             ASSERT_TRUE(power->getSupportInfo(&(*mSupportInfo)).isOk());
-            mSessionSupport = mSupportInfo->usesSessions;
-        } else if (mServiceVersion >= 2) {
-            status = power->createHintSession(getpid(), getuid(), kSelfTids, 16666666L, &mSession);
-            mSessionSupport = status.isOk();
         }
     }