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

Commit f34860d1 authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Automerger Merge Worker
Browse files

Merge "Don't overlog BrightnessEvents" into udc-dev am: 3568b128 

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



Change-Id: I8eea8a6fa5139bdc59093773ff1bef0bb11c00e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31a7541e 3568b128

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

+2 −3
Original line number Diff line number Diff line
@@ -1887,6 +1887,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 =
@@ -1895,9 +1896,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
@@ -1597,6 +1597,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 =
@@ -1605,9 +1606,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)