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

Commit 3ad58186 authored by Piotr Wilczyński's avatar Piotr Wilczyński
Browse files

Don't overlog BrightnessEvents 

- values for mTempBrightnessEvent should be set before comparing it to the last event
- don't compare initialBrightness - it's the last brightness so comparing it will mean that we log every brightness change twice

Bug: 268532189
Test: adb logcat | grep -i "brightnessEvent"
Change-Id: Ibc57fea4a6ae32e082b7d0873ad63aebc6f92ae2
parent dd887408

services/core/java/com/android/server/display/DisplayPowerController.java

+2 −3
Original line number Diff line number Diff line
@@ -1868,6 +1868,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                ? mCdsi.getReduceBrightColorsStrength() : -1);

        mTempBrightnessEvent.setPowerFactor(mPowerRequest.screenLowPowerBrightnessFactor);

        mTempBrightnessEvent.setWasShortTermModelActive(wasShortTermModelActive);

        mTempBrightnessEvent.setAutomaticBrightnessEnabled(mUseAutoBrightness);

        // Temporary is what we use during slider interactions. We avoid logging those so that

        // we don't spam logcat when the slider is being used.

        boolean tempToTempTransition =
@@ -1876,9 +1877,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                        == BrightnessReason.REASON_TEMPORARY;

        if ((!mTempBrightnessEvent.equalsMainData(mLastBrightnessEvent) && !tempToTempTransition)

                || brightnessAdjustmentFlags != 0) {

            float lastBrightness = mLastBrightnessEvent.getBrightness();

            mTempBrightnessEvent.setInitialBrightness(lastBrightness);

            mTempBrightnessEvent.setAutomaticBrightnessEnabled(mUseAutoBrightness);

            mTempBrightnessEvent.setInitialBrightness(mLastBrightnessEvent.getBrightness());

            mLastBrightnessEvent.copyFrom(mTempBrightnessEvent);

            BrightnessEvent newEvent = new BrightnessEvent(mTempBrightnessEvent);

            // Adjustment flags (and user-set flag) only get added after the equality checks since

services/core/java/com/android/server/display/DisplayPowerController2.java

+2 −3
Original line number Diff line number Diff line
@@ -1591,6 +1591,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        mTempBrightnessEvent.setWasShortTermModelActive(wasShortTermModelActive);

        mTempBrightnessEvent.setDisplayBrightnessStrategyName(displayBrightnessState

                .getDisplayBrightnessStrategyName());

        mTempBrightnessEvent.setAutomaticBrightnessEnabled(mUseAutoBrightness);

        // Temporary is what we use during slider interactions. We avoid logging those so that

        // we don't spam logcat when the slider is being used.

        boolean tempToTempTransition =
@@ -1599,9 +1600,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                        == BrightnessReason.REASON_TEMPORARY;

        if ((!mTempBrightnessEvent.equalsMainData(mLastBrightnessEvent) && !tempToTempTransition)

                || brightnessAdjustmentFlags != 0) {

            float lastBrightness = mLastBrightnessEvent.getBrightness();

            mTempBrightnessEvent.setInitialBrightness(lastBrightness);

            mTempBrightnessEvent.setAutomaticBrightnessEnabled(mUseAutoBrightness);

            mTempBrightnessEvent.setInitialBrightness(mLastBrightnessEvent.getBrightness());

            mLastBrightnessEvent.copyFrom(mTempBrightnessEvent);

            BrightnessEvent newEvent = new BrightnessEvent(mTempBrightnessEvent);

            // Adjustment flags (and user-set flag) only get added after the equality checks since

services/core/java/com/android/server/display/brightness/BrightnessEvent.java

+0 −2
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ public final class BrightnessEvent { 
                && Float.floatToRawIntBits(mLux) == Float.floatToRawIntBits(that.mLux)

                && Float.floatToRawIntBits(mPreThresholdLux)

                == Float.floatToRawIntBits(that.mPreThresholdLux)

                && Float.floatToRawIntBits(mInitialBrightness)

                == Float.floatToRawIntBits(that.mInitialBrightness)

                && Float.floatToRawIntBits(mBrightness)

                == Float.floatToRawIntBits(that.mBrightness)

                && Float.floatToRawIntBits(mRecommendedBrightness)