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

Commit f42d4936 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Tweak systrace for power manager."

parents 682a433d faec22c8

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

+4 −0
Original line number Diff line number Diff line
@@ -348,6 +348,10 @@ final class DisplayPowerState { 
        private int mActualBacklight = INITIAL_BACKLIGHT;

        private boolean mChangeInProgress;



        public PhotonicModulator() {

            super("PhotonicModulator");

        }



        public boolean setState(int state, int backlight) {

            synchronized (mLock) {

                if (state != mPendingState || backlight != mPendingBacklight) {

services/core/java/com/android/server/lights/LightsService.java

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ public class LightsService extends SystemService { 
                mMode = mode;

                mOnMS = onMS;

                mOffMS = offMS;

                Trace.traceBegin(Trace.TRACE_TAG_POWER, "setLight(" + mId + ", " + color + ")");

                Trace.traceBegin(Trace.TRACE_TAG_POWER, "setLight(" + mId + ", 0x"

                        + Integer.toHexString(color) + ")");

                try {

                    setLight_native(mNativePointer, mId, color, mode, onMS, offMS, brightnessMode);

                } finally {