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

Commit 45aa097c authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

Merge "Add trace counter for target screen brightness." into oc-mr1-dev 

am: 0ee6ea9e

Change-Id: I7d8fb5ff124bbbe80fc5fe83b0c8c3920d9c6a77
parents a0936c7b 0ee6ea9e

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

+1 −0
Original line number Diff line number Diff line
@@ -984,6 +984,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            Slog.d(TAG, "Animating brightness: target=" + target +", rate=" + rate);

        }

        if (mScreenBrightnessRampAnimator.animateTo(target, rate)) {

            Trace.traceCounter(Trace.TRACE_TAG_POWER, "TargetScreenBrightness", target);

            try {

                mBatteryStats.noteScreenBrightness(target);

            } catch (RemoteException ex) {

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

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
                        try {

                            mBacklight.setBrightness(brightness);

                            Trace.traceCounter(Trace.TRACE_TAG_POWER,

                                    "DisplayBrightness", brightness);

                                    "ScreenBrightness", brightness);

                        } finally {

                            Trace.traceEnd(Trace.TRACE_TAG_POWER);

                        }