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

Commit 58379d96 authored by Peiyong Lin's avatar Peiyong Lin Committed by Automerger Merge Worker
Browse files

Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 6da1a174 am:... 

Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 6da1a174 am: e9d251bb am: 2658bbf0

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

Change-Id: Ia9a0fea92cd55fe513b4f94ff440fb748e62dbca
parents bff2a868 2658bbf0

libs/gui/BufferHubProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ String8 BufferHubProducer::getConsumerName() const { 
    // relationship, thus |getConsumerName| from the producer side does not

    // make any sense.

    ALOGE("BufferHubProducer::getConsumerName not supported.");

    return String8("BufferHubQueue::DummyConsumer");

    return String8("BufferHubQueue::StubConsumer");

}



status_t BufferHubProducer::setSharedBufferMode(bool shared_buffer_mode) {

libs/gui/GLConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ status_t GLConsumer::releaseTexImage() { 
        mCurrentFenceTime = FenceTime::NO_FENCE;



        if (mAttached) {

            // This binds a dummy buffer (mReleasedTexImage).

            // This binds a buffer placeholder (mReleasedTexImage).

            status_t result = bindTextureImageLocked();

            if (result != NO_ERROR) {

                return result;

libs/gui/IProducerListener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ status_t BnProducerListener::onTransact(uint32_t code, const Parcel& data, 
    return BBinder::onTransact(code, data, reply, flags);

}



DummyProducerListener::~DummyProducerListener() = default;

StubProducerListener::~StubProducerListener() = default;



bool BnProducerListener::needsReleaseNotify() {

    return true;

libs/gui/Surface.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1513,7 +1513,7 @@ bool Surface::transformToDisplayInverse() { 
}



int Surface::connect(int api) {

    static sp<IProducerListener> listener = new DummyProducerListener();

    static sp<IProducerListener> listener = new StubProducerListener();

    return connect(api, listener);

}

libs/gui/include/gui/GLConsumer.h

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ private: 
    // protects static initialization

    static Mutex sStaticInitLock;



    // mReleasedTexImageBuffer is a dummy buffer used when in single buffer

    // mReleasedTexImageBuffer is a buffer placeholder used when in single buffer

    // mode and releaseTexImage() has been called

    static sp<GraphicBuffer> sReleasedTexImageBuffer;

    sp<EglImage> mReleasedTexImage;