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

Commit 93f8d0a3 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11338408 from 8af3ec98 to 24Q2-release 

Change-Id: I7db50271f400bc712203224c026c6f9cc78bc6a7
parents 36b1eeed 8af3ec98

libs/battery/MultiStateCounter.h

+12 −4
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
namespace android {

namespace battery {



#define REPORTED_INVALID_TIMESTAMP_DELTA_MS 60000



typedef uint16_t state_t;



template <class T>
@@ -171,8 +173,12 @@ void MultiStateCounter<T>::setState(state_t state, time_t timestamp) { 
        if (timestamp >= lastStateChangeTimestamp) {

            states[currentState].timeInStateSinceUpdate += timestamp - lastStateChangeTimestamp;

        } else {

            ALOGE("setState is called with an earlier timestamp: %lu, previous timestamp: %lu\n",

            if (timestamp < lastStateChangeTimestamp - REPORTED_INVALID_TIMESTAMP_DELTA_MS) {

                ALOGE("setState is called with an earlier timestamp: %lu, "

                      "previous timestamp: %lu\n",

                      (unsigned long)timestamp, (unsigned long)lastStateChangeTimestamp);

            }



            // The accumulated durations have become unreliable. For example, if the timestamp

            // sequence was 1000, 2000, 1000, 3000, if we accumulated the positive deltas,

            // we would get 4000, which is greater than (last - first). This could lead to
@@ -232,8 +238,10 @@ const T& MultiStateCounter<T>::updateValue(const T& value, time_t timestamp) { 
                    }

                }

            } else if (timestamp < lastUpdateTimestamp) {

                if (timestamp < lastUpdateTimestamp - REPORTED_INVALID_TIMESTAMP_DELTA_MS) {

                    ALOGE("updateValue is called with an earlier timestamp: %lu, previous: %lu\n",

                          (unsigned long)timestamp, (unsigned long)lastUpdateTimestamp);

                }



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

                    states[i].timeInStateSinceUpdate = 0;

services/surfaceflinger/SurfaceFlinger.cpp

+0 −8
Original line number Diff line number Diff line
@@ -492,14 +492,6 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI 
    mSupportsBlur = supportsBlurs;

    ALOGI_IF(!mSupportsBlur, "Disabling blur effects, they are not supported.");



    const size_t defaultListSize = MAX_LAYERS;

    auto listSize = property_get_int32("debug.sf.max_igbp_list_size", int32_t(defaultListSize));

    mMaxGraphicBufferProducerListSize = (listSize > 0) ? size_t(listSize) : defaultListSize;

    mGraphicBufferProducerListSizeLogThreshold =

            std::max(static_cast<int>(0.95 *

                                      static_cast<double>(mMaxGraphicBufferProducerListSize)),

                     1);



    property_get("debug.sf.luma_sampling", value, "1");

    mLumaSampling = atoi(value);

services/surfaceflinger/SurfaceFlinger.h

+0 −6
Original line number Diff line number Diff line
@@ -1212,12 +1212,6 @@ private: 
    float mGlobalSaturationFactor = 1.0f;

    mat4 mClientColorMatrix;



    size_t mMaxGraphicBufferProducerListSize = MAX_LAYERS;

    // If there are more GraphicBufferProducers tracked by SurfaceFlinger than

    // this threshold, then begin logging.

    size_t mGraphicBufferProducerListSizeLogThreshold =

            static_cast<size_t>(0.95 * static_cast<double>(MAX_LAYERS));



    // protected by mStateLock (but we could use another lock)

    bool mLayersRemoved = false;

    bool mLayersAdded = false;