Revert "Improve error message when invalid display id is passed to screencap with -d argument."

This reverts commit e696b74f13875bb5c5fa388c5a198df4eb1e98b9.

Reason for revert: <Droidmonitor created revert due to b/393477524.Will be verified through ABTD for standard investigation.>

Change-Id: Ib5ed9640d568bbc79648118acd305f63ed2919f5

6 files changed, 39 insertions, 196 deletions

diff --git a/cmds/screencap/Android.bp b/cmds/screencap/Android.bp
index 9f350b1d6054..16026eca2980 100644
--- a/cmds/screencap/Android.bp
+++ b/cmds/screencap/Android.bp
@@ -7,66 +7,25 @@ package {
     default_applicable_licenses: ["frameworks_base_license"],
 }
 
-cc_defaults {
-    name: "screencap_defaults",
+cc_binary {
+    name: "screencap",
 
-    cflags: [
-        "-Wall",
-        "-Werror",
-        "-Wunreachable-code",
-        "-Wunused",
-    ],
+    srcs: ["screencap.cpp"],
 
     shared_libs: [
-        "libbinder",
         "libcutils",
-        "libgui",
-        "libhwui",
+        "libutils",
+        "libbinder",
         "libjnigraphics",
+        "libhwui",
         "libui",
-        "libutils",
-    ],
-}
-
-cc_library {
-    name: "libscreencap",
-
-    defaults: [
-        "screencap_defaults",
-    ],
-
-    srcs: ["screencap_utils.cpp"],
-}
-
-cc_binary {
-    name: "screencap",
-
-    defaults: [
-        "screencap_defaults",
-    ],
-
-    srcs: ["screencap.cpp"],
-
-    static_libs: [
-        "libscreencap",
-    ],
-}
-
-cc_test {
-    name: "libscreencap_test",
-
-    defaults: [
-        "screencap_defaults",
-    ],
-
-    test_suites: ["device-tests"],
-
-    srcs: [
-        "tests/screencap_test.cpp",
+        "libgui",
     ],
 
-    static_libs: [
-        "libgmock",
-        "libscreencap",
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wunused",
+        "-Wunreachable-code",
     ],
 }
diff --git a/cmds/screencap/TEST_MAPPING b/cmds/screencap/TEST_MAPPING
deleted file mode 100644
index 05c598e1e9cc..000000000000
--- a/cmds/screencap/TEST_MAPPING
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "presubmit": [
-    {
-      "name": "libscreencap_test"
-    }
-  ],
-  "hwasan-presubmit": [
-    {
-      "name": "libscreencap_test"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/cmds/screencap/screencap.cpp b/cmds/screencap/screencap.cpp
index 1626410358a3..d563ad3fd3db 100644
--- a/cmds/screencap/screencap.cpp
+++ b/cmds/screencap/screencap.cpp
@@ -37,9 +37,6 @@
 #include <ui/GraphicTypes.h>
 #include <ui/PixelFormat.h>
 
-#include "utils/Errors.h"
-#include "screencap_utils.h"
-
 using namespace android;
 
 #define COLORSPACE_UNKNOWN    0
@@ -148,6 +145,24 @@ static status_t notifyMediaScanner(const char* fileName) {
     return NO_ERROR;
 }
 
+status_t capture(const DisplayId displayId,
+            const gui::CaptureArgs& captureArgs,
+            ScreenCaptureResults& outResult) {
+    sp<SyncScreenCaptureListener> captureListener = new SyncScreenCaptureListener();
+    ScreenshotClient::captureDisplay(displayId, captureArgs, captureListener);
+
+    ScreenCaptureResults captureResults = captureListener->waitForResults();
+    if (!captureResults.fenceResult.ok()) {
+        fprintf(stderr, "Failed to take screenshot. Status: %d\n",
+                fenceStatus(captureResults.fenceResult));
+        return 1;
+    }
+
+    outResult = captureResults;
+
+    return 0;
+}
+
 status_t saveImage(const char* fn, std::optional<AndroidBitmapCompressFormat> format,
                    const ScreenCaptureResults& captureResults) {
     void* base = nullptr;
@@ -412,12 +427,15 @@ int main(int argc, char** argv)
 
     std::vector<ScreenCaptureResults> results;
     const size_t numDisplays = displaysToCapture.size();
-    for (int i = 0; i < numDisplays; i++) {
+    for (int i=0; i<numDisplays; i++) {
+        ScreenCaptureResults result;
+
         // 1. Capture the screen
-        auto captureResult = screencap::capture(displaysToCapture[i], captureArgs);
-        if (captureResult.error().code() != OK) {
-            fprintf(stderr, "%sCapturing failed.\n", captureResult.error().message().c_str());
-            return 1;
+        if (const status_t captureStatus =
+            capture(displaysToCapture[i], captureArgs, result) != 0) {
+
+            fprintf(stderr, "Capturing failed.\n");
+            return captureStatus;
         }
 
         // 2. Save the capture result as an image.
@@ -435,7 +453,7 @@ int main(int argc, char** argv)
         if (!filename.empty()) {
             fn = filename.c_str();
         }
-        if (const status_t saveImageStatus = saveImage(fn, format, captureResult.value()) != 0) {
+        if (const status_t saveImageStatus = saveImage(fn, format, result) != 0) {
             fprintf(stderr, "Saving image failed.\n");
             return saveImageStatus;
         }
diff --git a/cmds/screencap/screencap_utils.cpp b/cmds/screencap/screencap_utils.cpp
deleted file mode 100644
index 03ade73d0e30..000000000000
--- a/cmds/screencap/screencap_utils.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "screencap_utils.h"
-
-#include "gui/SyncScreenCaptureListener.h"
-
-namespace android::screencap {
-
-base::Result<gui::ScreenCaptureResults> capture(const DisplayId displayId,
-                                                const gui::CaptureArgs& captureArgs) {
-    sp<SyncScreenCaptureListener> captureListener = new SyncScreenCaptureListener();
-    auto captureDisplayStatus =
-            ScreenshotClient::captureDisplay(displayId, captureArgs, captureListener);
-
-    gui::ScreenCaptureResults captureResults = captureListener->waitForResults();
-    if (!captureResults.fenceResult.ok()) {
-        status_t captureStatus = fenceStatus(captureResults.fenceResult);
-        std::stringstream errorMsg;
-        errorMsg << "Failed to take take screenshot. ";
-        if (captureStatus == NAME_NOT_FOUND) {
-            errorMsg << "Display Id '" << displayId.value << "' is not valid.\n";
-        }
-        return base::ResultError(errorMsg.str(), captureStatus);
-    }
-
-    return captureResults;
-}
-
-} // namespace android::screencap
\ No newline at end of file
diff --git a/cmds/screencap/screencap_utils.h b/cmds/screencap/screencap_utils.h
deleted file mode 100644
index 6580e3fa5ff1..000000000000
--- a/cmds/screencap/screencap_utils.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <android-base/result.h>
-#include <android/gui/DisplayCaptureArgs.h>
-
-#include "gui/ScreenCaptureResults.h"
-#include "ui/DisplayId.h"
-
-#pragma once
-
-namespace android::screencap {
-base::Result<gui::ScreenCaptureResults> capture(const DisplayId displayId,
-                                                const gui::CaptureArgs& captureArgs);
-} // namespace android::screencap
diff --git a/cmds/screencap/tests/screencap_test.cpp b/cmds/screencap/tests/screencap_test.cpp
deleted file mode 100644
index cbee0ee93624..000000000000
--- a/cmds/screencap/tests/screencap_test.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (C) 2025 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <binder/ProcessState.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "android/gui/CaptureArgs.h"
-#include "gmock/gmock.h"
-#include "gui/ScreenCaptureResults.h"
-#include "screencap_utils.h"
-#include "ui/DisplayId.h"
-
-using ::android::DisplayId;
-using ::android::OK;
-using ::android::ProcessState;
-using ::android::gui::CaptureArgs;
-using ::android::gui::ScreenCaptureResults;
-using ::testing::AllOf;
-using ::testing::HasSubstr;
-
-class ScreenCapTest : public ::testing::Test {
-protected:
-    static void SetUpTestSuite() {
-        // These lines are copied from screecap.cpp.  They are necessary to call binder.
-        ProcessState::self()->setThreadPoolMaxThreadCount(0);
-        ProcessState::self()->startThreadPool();
-    }
-};
-
-TEST_F(ScreenCapTest, Capture_InvalidDisplayNumber) {
-    DisplayId display;
-    display.value = -1;
-
-    CaptureArgs args;
-    auto result = ::android::screencap::capture(display, args);
-    EXPECT_NE(OK, result.error().code());
-    EXPECT_THAT(result.error().message(),
-                AllOf(HasSubstr("Display Id"), HasSubstr("is not valid.")));
-}
\ No newline at end of file