commit d882c6a09b7cfcd4651406fb284cd56da826f169
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jul 31 16:32:52 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 31 16:32:52 2024 +0000
tree f3952dce1f30beebe2b1cb0344826164f7e1c5bc
parent 7801c0bcf56e162a69daf2287fa1da631ebf2ae4
parent 3b85a4e59ad649211ddb5be4ec25addf289195a0

Merge "Fix validation logic in TvInputAidlTest" into main

tv/input/aidl/vts/functional/VtsHalTvInputTargetTest.cpp

diff --git a/tv/input/aidl/vts/functional/VtsHalTvInputTargetTest.cpp b/tv/input/aidl/vts/functional/VtsHalTvInputTargetTest.cpp
index 7e095f1..41a78eb 100644
--- a/tv/input/aidl/vts/functional/VtsHalTvInputTargetTest.cpp
+++ b/tv/input/aidl/vts/functional/VtsHalTvInputTargetTest.cpp
@@ -137,13 +137,15 @@
 }
 
 bool TvInputAidlTest::isValidHandle(NativeHandle& handle) {
-    if (handle.fds.empty()) {
+    if (handle.fds.empty() && handle.ints.empty()) {
         return false;
     }
-    for (size_t i = 0; i < handle.fds.size(); i++) {
-        int fd = handle.fds[i].get();
-        if (fcntl(fd, F_GETFL) < 0) {
-            return false;
+    if (!(handle.fds.empty())) {
+        for (size_t i = 0; i < handle.fds.size(); i++) {
+            int fd = handle.fds[i].get();
+            if (fcntl(fd, F_GETFL) < 0) {
+                return false;
+            }
         }
     }
     return true;