Merge "composer: remove IComposer.dumpDebugInfo" into tm-dev
diff --git a/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/IComposer.aidl b/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/IComposer.aidl
index 9abc608..21b9ad8 100644
--- a/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/IComposer.aidl
+++ b/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/IComposer.aidl
@@ -35,7 +35,6 @@
@VintfStability
interface IComposer {
android.hardware.graphics.composer3.IComposerClient createClient();
- String dumpDebugInfo();
android.hardware.graphics.composer3.Capability[] getCapabilities();
const int EX_NO_RESOURCES = 6;
}
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/IComposer.aidl b/graphics/composer/aidl/android/hardware/graphics/composer3/IComposer.aidl
index b8edd80..0ebc2b7 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/IComposer.aidl
+++ b/graphics/composer/aidl/android/hardware/graphics/composer3/IComposer.aidl
@@ -36,14 +36,6 @@
IComposerClient createClient();
/**
- * Retrieves implementation-defined debug information, which will be
- * displayed during, for example, `dumpsys SurfaceFlinger`.
- *
- * @return is a string of debug information.
- */
- String dumpDebugInfo();
-
- /**
* Provides a list of supported capabilities (as described in the
* definition of Capability above). This list must not change after
* initialization.
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/VtsComposerClient.cpp b/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/VtsComposerClient.cpp
index b3b10d0..468a69d 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/VtsComposerClient.cpp
+++ b/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/VtsComposerClient.cpp
@@ -173,8 +173,15 @@
}
ScopedAStatus VtsComposerClient::dumpDebugInfo() {
- std::string debugInfo;
- return mComposer->dumpDebugInfo(&debugInfo);
+ int pipefds[2];
+ if (pipe(pipefds) < 0) {
+ return ScopedAStatus::fromServiceSpecificError(IComposer::EX_NO_RESOURCES);
+ }
+
+ const auto status = mComposer->dump(pipefds[1], /*args*/ nullptr, /*numArgs*/ 0);
+ close(pipefds[0]);
+ close(pipefds[1]);
+ return ScopedAStatus::fromStatus(status);
}
std::pair<ScopedAStatus, DisplayIdentification> VtsComposerClient::getDisplayIdentificationData(