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

Commit 412d8ea9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update log info." into main am: 480dc567 

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



Change-Id: Iedc6c5b0abc96868237728e10bf240ed81bef219
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54ab50c2 480dc567

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

+1 −1
Original line number Diff line number Diff line
@@ -917,7 +917,7 @@ public class AutomaticBrightnessController { 
            setAmbientLux(mFastAmbientLux);

            if (mLoggingEnabled) {

                Slog.d(TAG, "updateAmbientLux: "

                        + ((mFastAmbientLux > mAmbientLux) ? "Brightened" : "Darkened") + ": "

                        + ((mFastAmbientLux > mPreThresholdLux) ? "Brightened" : "Darkened") + ": "

                        + "mAmbientBrighteningThreshold=" + mAmbientBrighteningThreshold + ", "

                        + "mAmbientDarkeningThreshold=" + mAmbientDarkeningThreshold + ", "

                        + "mAmbientLightRingBuffer=" + mAmbientLightRingBuffer + ", "

services/core/java/com/android/server/power/PowerManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -3659,7 +3659,7 @@ public final class PowerManagerService extends SystemService 
                        mBrightWhenDozingConfig);

                int wakefulness = powerGroup.getWakefulnessLocked();

                if (DEBUG_SPEW) {

                    Slog.d(TAG, "updateDisplayPowerStateLocked: displayReady=" + ready

                    Slog.d(TAG, "updatePowerGroupsLocked: displayReady=" + ready

                            + ", groupId=" + groupId

                            + ", policy=" + policyToString(powerGroup.getPolicyLocked())

                            + ", mWakefulness="