Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 596327a6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix handling shell command when no argument is given." into main

parents 47cf8d6c 76d7e216

services/camera/virtualcamera/VirtualCameraService.cc

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ binder_status_t VirtualCameraService::handleShellCommand(int in, int out, 
                                                         uint32_t numArgs) {

  if (numArgs <= 0) {

    dprintf(out, kShellCmdHelp);

    fsync(out);

    return STATUS_OK;

  }



  if (args == nullptr || args[0] == nullptr) {

services/camera/virtualcamera/tests/VirtualCameraServiceTest.cc

+7 −0
Original line number Diff line number Diff line
@@ -267,6 +267,13 @@ TEST_F(VirtualCameraServiceTest, ShellCmdWithNullArgs) { 
            STATUS_BAD_VALUE);

}



TEST_F(VirtualCameraServiceTest, ShellCmdWithNoArgs) {

  EXPECT_EQ(mCameraService->handleShellCommand(

                /*in=*/mDevNullFd, /*out=*/mDevNullFd, /*err=*/mDevNullFd,

                /*args=*/nullptr, /*numArgs=*/0),

            STATUS_OK);

}



TEST_F(VirtualCameraServiceTest, TestCameraShellCmd) {

  execute_shell_command("enable_test_camera");