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

Commit 0e6b1b65 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11237490 from b90d9493 to 24Q2-release 

Change-Id: Ic47f232c8ed30c227b9f078c99653e5863ebf1fb
parents 6f282cea b90d9493

include/input/Input.h

+2 −0
Original line number Diff line number Diff line
@@ -515,6 +515,8 @@ struct PointerProperties { 
    PointerProperties& operator=(const PointerProperties&) = default;

};



std::ostream& operator<<(std::ostream& out, const PointerProperties& properties);



// TODO(b/211379801) : Use a strong type from ftl/mixins.h instead

using DeviceId = int32_t;

libs/binder/tests/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -256,6 +256,12 @@ cc_defaults { 
    // contention on the device. b/276820894

    test_options: {

        unit_test: false,

        test_runner_options: [

            {

                name: "native-test-timeout",

                value: "10m",

            },

        ],

    },



    test_suites: ["general-tests"],

libs/gui/Choreographer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -344,6 +344,10 @@ void Choreographer::dispatchNullEvent(nsecs_t, PhysicalDisplayId) { 
    handleRefreshRateUpdates();

}



void Choreographer::dispatchHdcpLevelsChanged(PhysicalDisplayId, int32_t, int32_t) {

    LOG_ALWAYS_FATAL("dispatchHdcpLevelsChanged was called but was never registered");

}



void Choreographer::handleMessage(const Message& message) {

    switch (message.what) {

        case MSG_SCHEDULE_CALLBACKS:

libs/gui/DisplayEventDispatcher.cpp

+5 −0
Original line number Diff line number Diff line
@@ -195,6 +195,11 @@ bool DisplayEventDispatcher::processPendingEvents(nsecs_t* outTimestamp, 
                    dispatchFrameRateOverrides(ev.header.timestamp, ev.header.displayId,

                                               std::move(mFrameRateOverrides));

                    break;

                case DisplayEventReceiver::DISPLAY_EVENT_HDCP_LEVELS_CHANGE:

                    dispatchHdcpLevelsChanged(ev.header.displayId,

                                              ev.hdcpLevelsChange.connectedLevel,

                                              ev.hdcpLevelsChange.maxLevel);

                    break;

                default:

                    ALOGW("dispatcher %p ~ ignoring unknown event type %#x", this, ev.header.type);

                    break;

libs/gui/SurfaceComposerClient.cpp

+0 −1
Original line number Diff line number Diff line
@@ -3117,7 +3117,6 @@ status_t SurfaceComposerClient::removeWindowInfosListener( 
            ->removeWindowInfosListener(windowInfosListener,

                                        ComposerServiceAIDL::getComposerService());

}



// ----------------------------------------------------------------------------



status_t ScreenshotClient::captureDisplay(const DisplayCaptureArgs& captureArgs,