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

Commit 653ad04d authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "SF: Temporarily expose primary display id" am: c477cea4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1887608

Change-Id: I718402a7fe4830f9c543c0ab59ab66f5f8a69f66
parents cacc6c9b c477cea4

libs/gui/ISurfaceComposer.cpp

+21 −0
Original line number Diff line number Diff line
@@ -291,6 +291,17 @@ public: 
        return {};

    }



    status_t getPrimaryPhysicalDisplayId(PhysicalDisplayId* displayId) const override {

        Parcel data, reply;

        SAFE_PARCEL(data.writeInterfaceToken, ISurfaceComposer::getInterfaceDescriptor());

        SAFE_PARCEL(remote()->transact, BnSurfaceComposer::GET_PRIMARY_PHYSICAL_DISPLAY_ID, data,

                    &reply);

        uint64_t rawId;

        SAFE_PARCEL(reply.readUint64, &rawId);

        *displayId = PhysicalDisplayId(rawId);

        return NO_ERROR;

    }



    sp<IBinder> getPhysicalDisplayToken(PhysicalDisplayId displayId) const override {

        Parcel data, reply;

        data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
@@ -1713,6 +1724,16 @@ status_t BnSurfaceComposer::onTransact( 
                           [](PhysicalDisplayId id) { return id.value; });

            return reply->writeUint64Vector(rawIds);

        }

        case GET_PRIMARY_PHYSICAL_DISPLAY_ID: {

            CHECK_INTERFACE(ISurfaceComposer, data, reply);

            PhysicalDisplayId id;

            status_t result = getPrimaryPhysicalDisplayId(&id);

            if (result != NO_ERROR) {

                ALOGE("getPrimaryPhysicalDisplayId: Failed to get id");

                return result;

            }

            return reply->writeUint64(id.value);

        }

        case ADD_REGION_SAMPLING_LISTENER: {

            CHECK_INTERFACE(ISurfaceComposer, data, reply);

            Rect samplingArea;

libs/gui/SurfaceComposerClient.cpp

+4 −0
Original line number Diff line number Diff line
@@ -913,6 +913,10 @@ std::vector<PhysicalDisplayId> SurfaceComposerClient::getPhysicalDisplayIds() { 
    return ComposerService::getComposerService()->getPhysicalDisplayIds();

}



status_t SurfaceComposerClient::getPrimaryPhysicalDisplayId(PhysicalDisplayId* id) {

    return ComposerService::getComposerService()->getPrimaryPhysicalDisplayId(id);

}



std::optional<PhysicalDisplayId> SurfaceComposerClient::getInternalDisplayId() {

    return ComposerService::getComposerService()->getInternalDisplayId();

}

libs/gui/include/gui/ISurfaceComposer.h

+3 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ public: 
     */

    virtual std::vector<PhysicalDisplayId> getPhysicalDisplayIds() const = 0;



    virtual status_t getPrimaryPhysicalDisplayId(PhysicalDisplayId*) const = 0;



    // TODO(b/74619554): Remove this stopgap once the framework is display-agnostic.

    std::optional<PhysicalDisplayId> getInternalDisplayId() const {

        const auto displayIds = getPhysicalDisplayIds();
@@ -624,6 +626,7 @@ public: 
        ON_PULL_ATOM,

        ADD_TUNNEL_MODE_ENABLED_LISTENER,

        REMOVE_TUNNEL_MODE_ENABLED_LISTENER,

        GET_PRIMARY_PHYSICAL_DISPLAY_ID,

        // Always append new enum to the end.

    };

libs/gui/include/gui/SurfaceComposerClient.h

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ public: 


    //! Get stable IDs for connected physical displays

    static std::vector<PhysicalDisplayId> getPhysicalDisplayIds();

    static status_t getPrimaryPhysicalDisplayId(PhysicalDisplayId*);

    static std::optional<PhysicalDisplayId> getInternalDisplayId();



    //! Get token for a physical display given its stable ID

libs/gui/tests/Surface_test.cpp

+1 −0
Original line number Diff line number Diff line
@@ -694,6 +694,7 @@ public: 
            bool /*secure*/) override { return nullptr; }

    void destroyDisplay(const sp<IBinder>& /*display */) override {}

    std::vector<PhysicalDisplayId> getPhysicalDisplayIds() const override { return {}; }

    status_t getPrimaryPhysicalDisplayId(PhysicalDisplayId*) const override { return NO_ERROR; }

    sp<IBinder> getPhysicalDisplayToken(PhysicalDisplayId) const override { return nullptr; }

    status_t setTransactionState(const FrameTimelineInfo& /*frameTimelineInfo*/,

                                 const Vector<ComposerState>& /*state*/,