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

Commit 93e2deb7 authored by Simon MacMullen's avatar Simon MacMullen Committed by Automerger Merge Worker
Browse files

Merge "Add system properties for screen state and brightness." into rvc-dev... 

Merge "Add system properties for screen state and brightness." into rvc-dev am: 93e82cb1 am: 13f56257

Change-Id: I0aa43035350830daad960734ddbe44c6776ec6f0
parents c9f91b3c 13f56257

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

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.os.Message; 
import android.os.PowerManager;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

import android.os.UserHandle;

import android.provider.Settings;
@@ -1243,6 +1244,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


            if (!reportOnly) {

                Trace.traceCounter(Trace.TRACE_TAG_POWER, "ScreenState", state);

                // TODO(b/153319140) remove when we can get this from the above trace invocation

                SystemProperties.set("debug.tracing.screen_state", String.valueOf(state));

                mPowerState.setScreenState(state);

                // Tell battery stats about the transition.

                try {
@@ -1319,6 +1322,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        }

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

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

            // TODO(b/153319140) remove when we can get this from the above trace invocation

            SystemProperties.set("debug.tracing.screen_brightness", String.valueOf(target));

            try {

                // TODO(brightnessfloat): change BatteryStats to use float

                mBatteryStats.noteScreenBrightness(