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

Commit eba5cac6 authored by Huihong Luo's avatar Huihong Luo Committed by Android (Google) Code Review
Browse files

Merge "Remove internal display related methods"

parents 603c5a69 df99ddc7

cmds/screenrecord/screenrecord.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1159,13 +1159,13 @@ int main(int argc, char* const argv[]) { 
        { NULL,                 0,                  NULL, 0 }

    };



    std::optional<PhysicalDisplayId> displayId = SurfaceComposerClient::getInternalDisplayId();

    if (!displayId) {

        fprintf(stderr, "Failed to get ID for internal display\n");

    const std::vector<PhysicalDisplayId> ids = SurfaceComposerClient::getPhysicalDisplayIds();

    if (ids.empty()) {

        fprintf(stderr, "Failed to get ID for any displays\n");

        return 1;

    }



    gPhysicalDisplayId = *displayId;

    gPhysicalDisplayId = ids.front();



    while (true) {

        int optionIndex = 0;

cmds/stagefright/codec.cpp

+4 −1
Original line number Diff line number Diff line
@@ -411,7 +411,10 @@ int main(int argc, char **argv) { 
        composerClient = new SurfaceComposerClient;

        CHECK_EQ(composerClient->initCheck(), (status_t)OK);



        const sp<IBinder> display = SurfaceComposerClient::getInternalDisplayToken();

        const std::vector<PhysicalDisplayId> ids = SurfaceComposerClient::getPhysicalDisplayIds();

        CHECK(!ids.empty());



        const sp<IBinder> display = SurfaceComposerClient::getPhysicalDisplayToken(ids.front());

        CHECK(display != nullptr);



        ui::DisplayMode mode;

cmds/stagefright/mediafilter.cpp

+4 −1
Original line number Diff line number Diff line
@@ -749,7 +749,10 @@ int main(int argc, char **argv) { 
        composerClient = new SurfaceComposerClient;

        CHECK_EQ((status_t)OK, composerClient->initCheck());



        const android::sp<IBinder> display = SurfaceComposerClient::getInternalDisplayToken();

	const std::vector<PhysicalDisplayId> ids = SurfaceComposerClient::getPhysicalDisplayIds();

        CHECK(!ids.empty());



        const android::sp<IBinder> display = SurfaceComposerClient::getPhysicalDisplayToken(ids.front());

        CHECK(display != nullptr);



        ui::DisplayMode mode;

cmds/stagefright/stream.cpp

+7 −1
Original line number Diff line number Diff line
@@ -318,7 +318,13 @@ int main(int argc, char **argv) { 
    sp<SurfaceComposerClient> composerClient = new SurfaceComposerClient;

    CHECK_EQ(composerClient->initCheck(), (status_t)OK);



    const sp<IBinder> display = SurfaceComposerClient::getInternalDisplayToken();

    const std::vector<PhysicalDisplayId> ids = SurfaceComposerClient::getPhysicalDisplayIds();

    if (ids.empty()) {

        SLOGE("Failed to get ID for any displays\n");

        return 1;

    }



    const sp<IBinder> display = SurfaceComposerClient::getPhysicalDisplayToken(ids.front());

    CHECK(display != nullptr);



    ui::DisplayMode mode;