Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 0ee6ea9e81

Change-Id: I7d8fb5ff124bbbe80fc5fe83b0c8c3920d9c6a77
This commit is contained in:
Michael Wright
2017-08-22 19:26:10 +00:00
committed by android-build-merger
parent a0936c7b89 0ee6ea9e81
commit 45aa097c5c
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -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) {

2
services/core/java/com/android/server/display/LocalDisplayAdapter.java
View File

@@ -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);
}