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

Commit 9fc9bfb0 authored by Ady Abraham's avatar Ady Abraham
Browse files

cleanup(libgui): remove bq_setframerate flag 

the feature is launched, removing the flag.

Flag: EXEMPT flag removal
Bug: 409610709
Test: presubmit
Change-Id: I8080704da33066e381881765d281d5004eb7f2fa
parent 3a10a9e7

libs/gui/BLASTBufferQueue.cpp

+0 −19
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ void BLASTBufferItemConsumer::onSidebandStreamChanged() { 
    }

}



#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_SETFRAMERATE)

void BLASTBufferItemConsumer::onSetFrameRate(float frameRate, int8_t compatibility,

                                             int8_t changeFrameRateStrategy) {

    sp<BLASTBufferQueue> bbq = mBLASTBufferQueue.promote();
@@ -180,7 +179,6 @@ void BLASTBufferItemConsumer::onSetFrameRate(float frameRate, int8_t compatibili 
        bbq->setFrameRate(frameRate, compatibility, changeFrameRateStrategy);

    }

}

#endif



void BLASTBufferItemConsumer::resizeFrameEventHistory(size_t newSize) {

    Mutex::Autolock lock(mMutex);
@@ -963,23 +961,6 @@ public: 
        allocateThread.detach();

    }



    status_t setFrameRate(float frameRate, int8_t compatibility,

                          int8_t changeFrameRateStrategy) override {

        if (flags::bq_setframerate()) {

            return Surface::setFrameRate(frameRate, compatibility, changeFrameRateStrategy);

        }



        std::lock_guard _lock{mMutex};

        if (mDestroyed) {

            return DEAD_OBJECT;

        }

        if (!ValidateFrameRate(frameRate, compatibility, changeFrameRateStrategy,

                               "BBQSurface::setFrameRate")) {

            return BAD_VALUE;

        }

        return mBbq->setFrameRate(frameRate, compatibility, changeFrameRateStrategy);

    }



    status_t setFrameTimelineInfo(uint64_t frameNumber,

                                  const FrameTimelineInfo& frameTimelineInfo) override {

        std::lock_guard _lock{mMutex};

libs/gui/BufferQueue.cpp

+0 −2
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ void BufferQueue::ProxyConsumerListener::addAndGetFrameTimestamps( 
    }

}



#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_SETFRAMERATE)

void BufferQueue::ProxyConsumerListener::onSetFrameRate(float frameRate, int8_t compatibility,

                                                        int8_t changeFrameRateStrategy) {

    sp<ConsumerListener> listener(mConsumerListener.promote());
@@ -106,7 +105,6 @@ void BufferQueue::ProxyConsumerListener::onSetFrameRate(float frameRate, int8_t 
        listener->onSetFrameRate(frameRate, compatibility, changeFrameRateStrategy);

    }

}

#endif



#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_UNLIMITED_SLOTS)

void BufferQueue::ProxyConsumerListener::onSlotCountChanged(int slotCount) {

libs/gui/BufferQueueProducer.cpp

+0 −2
Original line number Diff line number Diff line
@@ -1950,7 +1950,6 @@ status_t BufferQueueProducer::setAutoPrerotation(bool autoPrerotation) { 
    return NO_ERROR;

}



#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_SETFRAMERATE)

status_t BufferQueueProducer::setFrameRate(float frameRate, int8_t compatibility,

                                           int8_t changeFrameRateStrategy) {

    ATRACE_CALL();
@@ -1971,7 +1970,6 @@ status_t BufferQueueProducer::setFrameRate(float frameRate, int8_t compatibility 
    }

    return NO_ERROR;

}

#endif



#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_EXTENDEDALLOCATE)

status_t BufferQueueProducer::setAdditionalOptions(

libs/gui/FrameRateUtils.cpp

+1 −3
Original line number Diff line number Diff line
@@ -56,11 +56,9 @@ bool ValidateFrameRate(float frameRate, int8_t compatibility, int8_t changeFrame 
            changeFrameRateStrategy != ANATIVEWINDOW_CHANGE_FRAME_RATE_ALWAYS) {

            ALOGE("%s failed - invalid change frame rate strategy value %d", functionName,

                  changeFrameRateStrategy);

            if (flags::bq_setframerate()) {

            return false;

        }

    }

    }



    return true;

}

libs/gui/IGraphicBufferProducer.cpp

+2 −6
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ public: 
        }

        return result;

    }

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_SETFRAMERATE)



    virtual status_t setFrameRate(float frameRate, int8_t compatibility,

                                  int8_t changeFrameRateStrategy) override {

        Parcel data, reply;
@@ -793,7 +793,7 @@ public: 
        }

        return result;

    }

#endif



#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_EXTENDEDALLOCATE)

    virtual status_t setAdditionalOptions(const std::vector<gui::AdditionalOptions>& options) {

        Parcel data, reply;
@@ -1016,13 +1016,11 @@ status_t IGraphicBufferProducer::setAutoPrerotation(bool autoPrerotation) { 
    return INVALID_OPERATION;

}



#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_SETFRAMERATE)

status_t IGraphicBufferProducer::setFrameRate(float /*frameRate*/, int8_t /*compatibility*/,

                                              int8_t /*changeFrameRateStrategy*/) {

    // No-op for IGBP other than BufferQueue.

    return INVALID_OPERATION;

}

#endif



#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_EXTENDEDALLOCATE)

status_t IGraphicBufferProducer::setAdditionalOptions(const std::vector<gui::AdditionalOptions>&) {
@@ -1572,7 +1570,6 @@ status_t BnGraphicBufferProducer::onTransact( 
            reply->writeInt32(result);

            return NO_ERROR;

        }

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_SETFRAMERATE)

        case SET_FRAME_RATE: {

            CHECK_INTERFACE(IGraphicBuffer, data, reply);

            float frameRate = data.readFloat();
@@ -1582,7 +1579,6 @@ status_t BnGraphicBufferProducer::onTransact( 
            reply->writeInt32(result);

            return NO_ERROR;

        }

#endif

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_EXTENDEDALLOCATE)

        case SET_ADDITIONAL_OPTIONS: {

            CHECK_INTERFACE(IGraphicBuffer, data, reply);