commit a8053e022b0225bce878e5422fe33859eb409f88
author Adam Shih <adamshih@google.com> Mon Mar 27 11:42:16 2023 +0800
committer Adam Shih <adamshih@google.com> Mon Mar 27 12:07:57 2023 +0800
tree 9b6fc79dfb4805dcde4d8a5de2cc25117913f6a6
parent b5b3cb74e5f37c7a0b55735ca9e07fc21fcf88a3

comply with VTS requirements

Bug: 275036679
Bug: 275034315
Test:
atest VtsHalDumpstateTargetTest:PerInstanceAndMode/DumpstateAidlPerModeTest#TestOk/0_android_hardware_dumpstate_IDumpstateDevice_default_FULL
atest VtsHalDumpstateTargetTest:PerInstance/DumpstateAidlGeneralTest#TestInvalidModeArgument_Negative/0_android_hardware_dumpstate_IDumpstateDevice_default

Change-Id: I105f59f4c3e89e952cd89cb4ad28a5dfcc9c147f

gear/dumpstate/Dumpstate.cpp

diff --git a/gear/dumpstate/Dumpstate.cpp b/gear/dumpstate/Dumpstate.cpp
index 1e4d982..842e67d 100644
--- a/gear/dumpstate/Dumpstate.cpp
+++ b/gear/dumpstate/Dumpstate.cpp
@@ -154,8 +154,10 @@
                                              int64_t in_timeoutMillis) {
     // Unused arguments.
     (void) in_timeoutMillis;
-    (void) in_mode;
-
+    if (in_mode < IDumpstateDevice::DumpstateMode::FULL || in_mode > IDumpstateDevice::DumpstateMode::PROTO) {
+        ALOGE("Invalid mode: %d\n", in_mode);
+        return ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_ARGUMENT, "Invalid mode");
+    }
     if (in_fds.size() < 1) {
         ALOGE("no FDs\n");
         return ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_ARGUMENT,
@@ -171,6 +173,7 @@
 
     if (in_fds.size() < 2) {
           ALOGE("no FD for dumpstate_board binary\n");
+          dumpTextSection(fd, "");
     } else {
           int fd_bin = in_fds[1].get();
           dumpLogSection(fd, fd_bin);