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

Commit ebbe94b5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypick-dumpDebugInfo-ea1c7t8av9" into tm-mainline-prod 

* changes:
  [automerge] composer: remove IComposer.dumpDebugInfo 2p: 89d7270d
  composer: remove IComposer.dumpDebugInfo
parents 2fe0d563 7f0908a6

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/IComposer.aidl

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ package android.hardware.graphics.composer3; 
@VintfStability

interface IComposer {

  android.hardware.graphics.composer3.IComposerClient createClient();

  String dumpDebugInfo();

  android.hardware.graphics.composer3.Capability[] getCapabilities();

  const int EX_NO_RESOURCES = 6;

}

graphics/composer/aidl/android/hardware/graphics/composer3/IComposer.aidl

+0 −8
Original line number Diff line number Diff line
@@ -35,14 +35,6 @@ interface IComposer { 
     */

    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

graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/VtsComposerClient.cpp

+9 −2
Original line number Diff line number Diff line
@@ -173,8 +173,15 @@ std::pair<ScopedAStatus, std::vector<DisplayCapability>> VtsComposerClient::getD 
}



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(