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

Commit 4d1ce2a7 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master 

Bug: 146167222
Change-Id: Iaba133dfa9dd59eabf3d91a1c15a0435850d10af
parents 00007148 240950e0

include/input/IInputFlinger.h

+1 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ public: 


    virtual void setInputWindows(const std::vector<InputWindowInfo>& inputHandles,

            const sp<ISetInputWindowsListener>& setInputWindowsListener) = 0;

    virtual void transferTouchFocus(const sp<IBinder>& fromToken, const sp<IBinder>& toToken) = 0;

    virtual void registerInputChannel(const sp<InputChannel>& channel) = 0;

    virtual void unregisterInputChannel(const sp<InputChannel>& channel) = 0;

};
@@ -51,8 +50,7 @@ public: 
    enum {

        SET_INPUT_WINDOWS_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION,

        REGISTER_INPUT_CHANNEL_TRANSACTION,

        UNREGISTER_INPUT_CHANNEL_TRANSACTION,

        TRANSFER_TOUCH_FOCUS

        UNREGISTER_INPUT_CHANNEL_TRANSACTION

    };



    virtual status_t onTransact(uint32_t code, const Parcel& data,

libs/binder/Parcel.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2543,11 +2543,13 @@ status_t Parcel::continueWrite(size_t desired) 
            if (objectsSize == 0) {

                free(mObjects);

                mObjects = nullptr;

                mObjectsCapacity = 0;

            } else {

                binder_size_t* objects =

                    (binder_size_t*)realloc(mObjects, objectsSize*sizeof(binder_size_t));

                if (objects) {

                    mObjects = objects;

                    mObjectsCapacity = objectsSize;

                }

            }

            mObjectsSize = objectsSize;

libs/dumputils/dump_utils.cpp

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ static const char* hal_interfaces_to_dump[] { 
        "android.hardware.sensors@1.0::ISensors",

        "android.hardware.thermal@2.0::IThermal",

        "android.hardware.vr@1.0::IVr",

        "android.hardware.automotive.audiocontrol@1.0::IAudioControl",

        "android.hardware.automotive.vehicle@2.0::IVehicle",

        "android.hardware.automotive.evs@1.0::IEvsCamera",

        NULL,

};

libs/gui/BufferQueueConsumer.cpp

+7 −3
Original line number Diff line number Diff line
@@ -166,7 +166,9 @@ status_t BufferQueueConsumer::acquireBuffer(BufferItem* outBuffer, 
                        mCore->mFreeBuffers.push_back(front->mSlot);

                    }



                    if (mCore->mBufferReleasedCbEnabled) {

                        listener = mCore->mConnectedProducerListener;

                    }

                    ++numDroppedBuffers;

                }
@@ -457,7 +459,9 @@ status_t BufferQueueConsumer::releaseBuffer(int slot, uint64_t frameNumber, 
            mCore->mFreeBuffers.push_back(slot);

        }



        if (mCore->mBufferReleasedCbEnabled) {

            listener = mCore->mConnectedProducerListener;

        }

        BQ_LOGV("releaseBuffer: releasing slot %d", slot);



        mCore->mDequeueCondition.notify_all();
@@ -668,7 +672,7 @@ status_t BufferQueueConsumer::setMaxAcquiredBufferCount( 
        BQ_LOGV("setMaxAcquiredBufferCount: %d", maxAcquiredBuffers);

        mCore->mMaxAcquiredBufferCount = maxAcquiredBuffers;

        VALIDATE_CONSISTENCY();

        if (delta < 0) {

        if (delta < 0 && mCore->mBufferReleasedCbEnabled) {

            listener = mCore->mConsumerListener;

        }

    }

libs/gui/BufferQueueCore.cpp

+7 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ BufferQueueCore::BufferQueueCore() : 
    mConnectedApi(NO_CONNECTED_API),

    mLinkedToDeath(),

    mConnectedProducerListener(),

    mBufferReleasedCbEnabled(false),

    mSlots(),

    mQueue(),

    mFreeSlots(),
@@ -260,6 +261,12 @@ void BufferQueueCore::freeAllBuffersLocked() { 
}



void BufferQueueCore::discardFreeBuffersLocked() {

    // Notify producer about the discarded buffers.

    if (mConnectedProducerListener != nullptr && mFreeBuffers.size() > 0) {

        std::vector<int32_t> freeBuffers(mFreeBuffers.begin(), mFreeBuffers.end());

        mConnectedProducerListener->onBuffersDiscarded(freeBuffers);

    }



    for (int s : mFreeBuffers) {

        mFreeSlots.insert(s);

        clearBufferSlotLocked(s);