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

Commit 9c804c47 authored by Yi Kong's avatar Yi Kong
Browse files

Replace NULL/0 with nullptr 

Fixes -Wzero-as-null-pointer-constant warning.

clang-tidy -checks=modernize-use-nullptr -p compile_commands.json -fix ...

Test: m
Bug: 68236239
Change-Id: I3a8e982ba40f9b029bafef78437b146a878f56a9
Merged-In: I3a8e982ba40f9b029bafef78437b146a878f56a9
(cherry picked from commit 48a619f8)
parent 88d73c02

libs/gui/BufferItem.cpp

+8 −8
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ static inline constexpr T to64(const uint32_t lo, const uint32_t hi) { 
}



BufferItem::BufferItem() :

    mGraphicBuffer(NULL),

    mFence(NULL),

    mGraphicBuffer(nullptr),

    mFence(nullptr),

    mCrop(Rect::INVALID_RECT),

    mTransform(0),

    mScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE),
@@ -89,11 +89,11 @@ size_t BufferItem::getPodSize() const { 


size_t BufferItem::getFlattenedSize() const {

    size_t size = sizeof(uint32_t); // Flags

    if (mGraphicBuffer != 0) {

    if (mGraphicBuffer != nullptr) {

        size += mGraphicBuffer->getFlattenedSize();

        size = FlattenableUtils::align<4>(size);

    }

    if (mFence != 0) {

    if (mFence != nullptr) {

        size += mFence->getFlattenedSize();

        size = FlattenableUtils::align<4>(size);

    }
@@ -104,10 +104,10 @@ size_t BufferItem::getFlattenedSize() const { 


size_t BufferItem::getFdCount() const {

    size_t count = 0;

    if (mGraphicBuffer != 0) {

    if (mGraphicBuffer != nullptr) {

        count += mGraphicBuffer->getFdCount();

    }

    if (mFence != 0) {

    if (mFence != nullptr) {

        count += mFence->getFdCount();

    }

    return count;
@@ -134,13 +134,13 @@ status_t BufferItem::flatten( 
    FlattenableUtils::advance(buffer, size, sizeof(uint32_t));



    flags = 0;

    if (mGraphicBuffer != 0) {

    if (mGraphicBuffer != nullptr) {

        status_t err = mGraphicBuffer->flatten(buffer, size, fds, count);

        if (err) return err;

        size -= FlattenableUtils::align<4>(buffer);

        flags |= 1;

    }

    if (mFence != 0) {

    if (mFence != nullptr) {

        status_t err = mFence->flatten(buffer, size, fds, count);

        if (err) return err;

        size -= FlattenableUtils::align<4>(buffer);

libs/gui/BufferItemConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ status_t BufferItemConsumer::releaseBuffer(const BufferItem &item, 


void BufferItemConsumer::freeBufferLocked(int slotIndex) {

    sp<BufferFreedListener> listener = mBufferFreedListener.promote();

    if (listener != NULL && mSlots[slotIndex].mGraphicBuffer != NULL) {

    if (listener != nullptr && mSlots[slotIndex].mGraphicBuffer != nullptr) {

        // Fire callback if we have a listener registered and the buffer being freed is valid.

        BI_LOGV("actually calling onBufferFreed");

        listener->onBufferFreed(mSlots[slotIndex].mGraphicBuffer);

libs/gui/BufferQueue.cpp

+10 −10
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ BufferQueue::ProxyConsumerListener::~ProxyConsumerListener() {} 


void BufferQueue::ProxyConsumerListener::onDisconnect() {

    sp<ConsumerListener> listener(mConsumerListener.promote());

    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onDisconnect();

    }

}
@@ -41,7 +41,7 @@ void BufferQueue::ProxyConsumerListener::onDisconnect() { 
void BufferQueue::ProxyConsumerListener::onFrameAvailable(

        const BufferItem& item) {

    sp<ConsumerListener> listener(mConsumerListener.promote());

    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onFrameAvailable(item);

    }

}
@@ -49,21 +49,21 @@ void BufferQueue::ProxyConsumerListener::onFrameAvailable( 
void BufferQueue::ProxyConsumerListener::onFrameReplaced(

        const BufferItem& item) {

    sp<ConsumerListener> listener(mConsumerListener.promote());

    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onFrameReplaced(item);

    }

}



void BufferQueue::ProxyConsumerListener::onBuffersReleased() {

    sp<ConsumerListener> listener(mConsumerListener.promote());

    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onBuffersReleased();

    }

}



void BufferQueue::ProxyConsumerListener::onSidebandStreamChanged() {

    sp<ConsumerListener> listener(mConsumerListener.promote());

    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onSidebandStreamChanged();

    }

}
@@ -80,21 +80,21 @@ void BufferQueue::ProxyConsumerListener::addAndGetFrameTimestamps( 
void BufferQueue::createBufferQueue(sp<IGraphicBufferProducer>* outProducer,

        sp<IGraphicBufferConsumer>* outConsumer,

        bool consumerIsSurfaceFlinger) {

    LOG_ALWAYS_FATAL_IF(outProducer == NULL,

    LOG_ALWAYS_FATAL_IF(outProducer == nullptr,

            "BufferQueue: outProducer must not be NULL");

    LOG_ALWAYS_FATAL_IF(outConsumer == NULL,

    LOG_ALWAYS_FATAL_IF(outConsumer == nullptr,

            "BufferQueue: outConsumer must not be NULL");



    sp<BufferQueueCore> core(new BufferQueueCore());

    LOG_ALWAYS_FATAL_IF(core == NULL,

    LOG_ALWAYS_FATAL_IF(core == nullptr,

            "BufferQueue: failed to create BufferQueueCore");



    sp<IGraphicBufferProducer> producer(new BufferQueueProducer(core, consumerIsSurfaceFlinger));

    LOG_ALWAYS_FATAL_IF(producer == NULL,

    LOG_ALWAYS_FATAL_IF(producer == nullptr,

            "BufferQueue: failed to create BufferQueueProducer");



    sp<IGraphicBufferConsumer> consumer(new BufferQueueConsumer(core));

    LOG_ALWAYS_FATAL_IF(consumer == NULL,

    LOG_ALWAYS_FATAL_IF(consumer == nullptr,

            "BufferQueue: failed to create BufferQueueConsumer");



    *outProducer = producer;

libs/gui/BufferQueueConsumer.cpp

+12 −12
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ status_t BufferQueueConsumer::acquireBuffer(BufferItem* outBuffer, 
        // mGraphicBuffer to NULL to avoid unnecessarily remapping this buffer

        // on the consumer side

        if (outBuffer->mAcquireCalled) {

            outBuffer->mGraphicBuffer = NULL;

            outBuffer->mGraphicBuffer = nullptr;

        }



        mCore->mQueue.erase(front);
@@ -270,7 +270,7 @@ status_t BufferQueueConsumer::acquireBuffer(BufferItem* outBuffer, 
        VALIDATE_CONSISTENCY();

    }



    if (listener != NULL) {

    if (listener != nullptr) {

        for (int i = 0; i < numDroppedBuffers; ++i) {

            listener->onBufferReleased();

        }
@@ -319,10 +319,10 @@ status_t BufferQueueConsumer::attachBuffer(int* outSlot, 
        const sp<android::GraphicBuffer>& buffer) {

    ATRACE_CALL();



    if (outSlot == NULL) {

    if (outSlot == nullptr) {

        BQ_LOGE("attachBuffer: outSlot must not be NULL");

        return BAD_VALUE;

    } else if (buffer == NULL) {

    } else if (buffer == nullptr) {

        BQ_LOGE("attachBuffer: cannot attach NULL buffer");

        return BAD_VALUE;

    }
@@ -411,7 +411,7 @@ status_t BufferQueueConsumer::releaseBuffer(int slot, uint64_t frameNumber, 
    ATRACE_BUFFER_INDEX(slot);



    if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS ||

            releaseFence == NULL) {

            releaseFence == nullptr) {

        BQ_LOGE("releaseBuffer: slot %d out of range or fence %p NULL", slot,

                releaseFence.get());

        return BAD_VALUE;
@@ -463,7 +463,7 @@ status_t BufferQueueConsumer::releaseBuffer(int slot, uint64_t frameNumber, 
    } // Autolock scope



    // Call back without lock held

    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onBufferReleased();

    }
@@ -474,7 +474,7 @@ status_t BufferQueueConsumer::connect( 
        const sp<IConsumerListener>& consumerListener, bool controlledByApp) {

    ATRACE_CALL();



    if (consumerListener == NULL) {

    if (consumerListener == nullptr) {

        BQ_LOGE("connect: consumerListener may not be NULL");

        return BAD_VALUE;

    }
@@ -502,13 +502,13 @@ status_t BufferQueueConsumer::disconnect() { 


    Mutex::Autolock lock(mCore->mMutex);



    if (mCore->mConsumerListener == NULL) {

    if (mCore->mConsumerListener == nullptr) {

        BQ_LOGE("disconnect: no consumer is connected");

        return BAD_VALUE;

    }



    mCore->mIsAbandoned = true;

    mCore->mConsumerListener = NULL;

    mCore->mConsumerListener = nullptr;

    mCore->mQueue.clear();

    mCore->freeAllBuffersLocked();

    mCore->mSharedBufferSlot = BufferQueueCore::INVALID_BUFFER_SLOT;
@@ -519,7 +519,7 @@ status_t BufferQueueConsumer::disconnect() { 
status_t BufferQueueConsumer::getReleasedBuffers(uint64_t *outSlotMask) {

    ATRACE_CALL();



    if (outSlotMask == NULL) {

    if (outSlotMask == nullptr) {

        BQ_LOGE("getReleasedBuffers: outSlotMask may not be NULL");

        return BAD_VALUE;

    }
@@ -671,7 +671,7 @@ status_t BufferQueueConsumer::setMaxAcquiredBufferCount( 
        }

    }

    // Call back without lock held

    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onBuffersReleased();

    }
@@ -764,7 +764,7 @@ status_t BufferQueueConsumer::dumpState(const String8& prefix, String8* outResul 
        outResult->appendFormat("Permission Denial: can't dump BufferQueueConsumer "

                "from pid=%d, uid=%d\n", pid, uid);

        android_errorWriteWithInfoLog(0x534e4554, "27046057",

                static_cast<int32_t>(uid), NULL, 0);

                static_cast<int32_t>(uid), nullptr, 0);

        return PERMISSION_DENIED;

    }

libs/gui/BufferQueueProducer.cpp

+26 −26
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ status_t BufferQueueProducer::setMaxDequeuedBufferCount( 
    } // Autolock scope



    // Call back without lock held

    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onBuffersReleased();

    }
@@ -221,7 +221,7 @@ status_t BufferQueueProducer::setAsyncMode(bool async) { 
    } // Autolock scope



    // Call back without lock held

    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onBuffersReleased();

    }

    return NO_ERROR;
@@ -450,11 +450,11 @@ status_t BufferQueueProducer::dequeueBuffer(int* outSlot, sp<android::Fence>* ou 


        mSlots[found].mBufferState.dequeue();



        if ((buffer == NULL) ||

        if ((buffer == nullptr) ||

                buffer->needsReallocation(width, height, format, BQ_LAYER_COUNT, usage))

        {

            mSlots[found].mAcquireCalled = false;

            mSlots[found].mGraphicBuffer = NULL;

            mSlots[found].mGraphicBuffer = nullptr;

            mSlots[found].mRequestBufferCalled = false;

            mSlots[found].mEglDisplay = EGL_NO_DISPLAY;

            mSlots[found].mEglFence = EGL_NO_SYNC_KHR;
@@ -472,7 +472,7 @@ status_t BufferQueueProducer::dequeueBuffer(int* outSlot, sp<android::Fence>* ou 
        BQ_LOGV("dequeueBuffer: setting buffer age to %" PRIu64,

                mCore->mBufferAge);



        if (CC_UNLIKELY(mSlots[found].mFence == NULL)) {

        if (CC_UNLIKELY(mSlots[found].mFence == nullptr)) {

            BQ_LOGE("dequeueBuffer: about to return a NULL fence - "

                    "slot=%d w=%d h=%d format=%u",

                    found, buffer->width, buffer->height, buffer->format);
@@ -613,7 +613,7 @@ status_t BufferQueueProducer::detachBuffer(int slot) { 
        listener = mCore->mConsumerListener;

    }



    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onBuffersReleased();

    }
@@ -624,10 +624,10 @@ status_t BufferQueueProducer::detachNextBuffer(sp<GraphicBuffer>* outBuffer, 
        sp<Fence>* outFence) {

    ATRACE_CALL();



    if (outBuffer == NULL) {

    if (outBuffer == nullptr) {

        BQ_LOGE("detachNextBuffer: outBuffer must not be NULL");

        return BAD_VALUE;

    } else if (outFence == NULL) {

    } else if (outFence == nullptr) {

        BQ_LOGE("detachNextBuffer: outFence must not be NULL");

        return BAD_VALUE;

    }
@@ -671,7 +671,7 @@ status_t BufferQueueProducer::detachNextBuffer(sp<GraphicBuffer>* outBuffer, 
        listener = mCore->mConsumerListener;

    }



    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onBuffersReleased();

    }
@@ -682,10 +682,10 @@ status_t BufferQueueProducer::attachBuffer(int* outSlot, 
        const sp<android::GraphicBuffer>& buffer) {

    ATRACE_CALL();



    if (outSlot == NULL) {

    if (outSlot == nullptr) {

        BQ_LOGE("attachBuffer: outSlot must not be NULL");

        return BAD_VALUE;

    } else if (buffer == NULL) {

    } else if (buffer == nullptr) {

        BQ_LOGE("attachBuffer: cannot attach NULL buffer");

        return BAD_VALUE;

    }
@@ -766,7 +766,7 @@ status_t BufferQueueProducer::queueBuffer(int slot, 
            &getFrameTimestamps);

    const Region& surfaceDamage = input.getSurfaceDamage();



    if (acquireFence == NULL) {

    if (acquireFence == nullptr) {

        BQ_LOGE("queueBuffer: fence is NULL");

        return BAD_VALUE;

    }
@@ -970,9 +970,9 @@ status_t BufferQueueProducer::queueBuffer(int slot, 
            mCallbackCondition.wait(mCallbackMutex);

        }



        if (frameAvailableListener != NULL) {

        if (frameAvailableListener != nullptr) {

            frameAvailableListener->onFrameAvailable(item);

        } else if (frameReplacedListener != NULL) {

        } else if (frameReplacedListener != nullptr) {

            frameReplacedListener->onFrameReplaced(item);

        }
@@ -1037,7 +1037,7 @@ status_t BufferQueueProducer::cancelBuffer(int slot, const sp<Fence>& fence) { 
        BQ_LOGE("cancelBuffer: slot %d is not owned by the producer "

                "(state = %s)", slot, mSlots[slot].mBufferState.string());

        return BAD_VALUE;

    } else if (fence == NULL) {

    } else if (fence == nullptr) {

        BQ_LOGE("cancelBuffer: fence is NULL");

        return BAD_VALUE;

    }
@@ -1067,7 +1067,7 @@ int BufferQueueProducer::query(int what, int *outValue) { 
    ATRACE_CALL();

    Mutex::Autolock lock(mCore->mMutex);



    if (outValue == NULL) {

    if (outValue == nullptr) {

        BQ_LOGE("query: outValue was NULL");

        return BAD_VALUE;

    }
@@ -1140,12 +1140,12 @@ status_t BufferQueueProducer::connect(const sp<IProducerListener>& listener, 
        return NO_INIT;

    }



    if (mCore->mConsumerListener == NULL) {

    if (mCore->mConsumerListener == nullptr) {

        BQ_LOGE("connect: BufferQueue has no consumer");

        return NO_INIT;

    }



    if (output == NULL) {

    if (output == nullptr) {

        BQ_LOGE("connect: output was NULL");

        return BAD_VALUE;

    }
@@ -1183,10 +1183,10 @@ status_t BufferQueueProducer::connect(const sp<IProducerListener>& listener, 
            output->nextFrameNumber = mCore->mFrameCounter + 1;

            output->bufferReplaced = false;



            if (listener != NULL) {

            if (listener != nullptr) {

                // Set up a death notification so that we can disconnect

                // automatically if the remote producer dies

                if (IInterface::asBinder(listener)->remoteBinder() != NULL) {

                if (IInterface::asBinder(listener)->remoteBinder() != nullptr) {

                    status = IInterface::asBinder(listener)->linkToDeath(

                            static_cast<IBinder::DeathRecipient*>(this));

                    if (status != NO_ERROR) {
@@ -1263,7 +1263,7 @@ status_t BufferQueueProducer::disconnect(int api, DisconnectMode mode) { 
                    mCore->freeAllBuffersLocked();



                    // Remove our death notification callback if we have one

                    if (mCore->mLinkedToDeath != NULL) {

                    if (mCore->mLinkedToDeath != nullptr) {

                        sp<IBinder> token =

                                IInterface::asBinder(mCore->mLinkedToDeath);

                        // This can fail if we're here because of the death
@@ -1273,8 +1273,8 @@ status_t BufferQueueProducer::disconnect(int api, DisconnectMode mode) { 
                    }

                    mCore->mSharedBufferSlot =

                            BufferQueueCore::INVALID_BUFFER_SLOT;

                    mCore->mLinkedToDeath = NULL;

                    mCore->mConnectedProducerListener = NULL;

                    mCore->mLinkedToDeath = nullptr;

                    mCore->mConnectedProducerListener = nullptr;

                    mCore->mConnectedApi = BufferQueueCore::NO_CONNECTED_API;

                    mCore->mConnectedPid = -1;

                    mCore->mSidebandStream.clear();
@@ -1297,7 +1297,7 @@ status_t BufferQueueProducer::disconnect(int api, DisconnectMode mode) { 
    } // Autolock scope



    // Call back without lock held

    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onBuffersReleased();

        listener->onDisconnect();

    }
@@ -1313,7 +1313,7 @@ status_t BufferQueueProducer::setSidebandStream(const sp<NativeHandle>& stream) 
        listener = mCore->mConsumerListener;

    } // Autolock scope



    if (listener != NULL) {

    if (listener != nullptr) {

        listener->onSidebandStreamChanged();

    }

    return NO_ERROR;
@@ -1527,7 +1527,7 @@ void BufferQueueProducer::addAndGetFrameTimestamps( 
        Mutex::Autolock lock(mCore->mMutex);

        listener = mCore->mConsumerListener;

    }

    if (listener != NULL) {

    if (listener != nullptr) {

        listener->addAndGetFrameTimestamps(newTimestamps, outDelta);

    }

}