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

Merge "Add idleEnabled to brightness event logging" into tm-qpr-dev am: b456bec06a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19458994

Change-Id: I51234613b2370b5098bffa4e37fbb73115a8db33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Fiona Campbell
2022-08-03 13:31:33 +00:00
committed by Automerger Merge Worker
parent f644bd8401 b456bec06a
commit 241d2a4e21
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/display/AutomaticBrightnessController.java
View File

@@ -344,7 +344,9 @@ class AutomaticBrightnessController {
brightnessEvent.recommendedBrightness = mScreenAutoBrightness; brightnessEvent.recommendedBrightness = mScreenAutoBrightness;
brightnessEvent.flags |= (!mAmbientLuxValid ? BrightnessEvent.FLAG_INVALID_LUX : 0) brightnessEvent.flags |= (!mAmbientLuxValid ? BrightnessEvent.FLAG_INVALID_LUX : 0)
| (mDisplayPolicy == DisplayPowerRequest.POLICY_DOZE | (mDisplayPolicy == DisplayPowerRequest.POLICY_DOZE
? BrightnessEvent.FLAG_DOZE_SCALE : 0); ? BrightnessEvent.FLAG_DOZE_SCALE : 0)
| (mCurrentBrightnessMapper.isForIdleMode()
? BrightnessEvent.FLAG_IDLE_CURVE : 0);
} }
if (!mAmbientLuxValid) { if (!mAmbientLuxValid) {

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

@@ -2738,8 +2738,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
class BrightnessEvent { class BrightnessEvent {
static final int FLAG_RBC = 0x1; static final int FLAG_RBC = 0x1;
static final int FLAG_INVALID_LUX = 0x2; static final int FLAG_INVALID_LUX = 0x2;
static final int FLAG_DOZE_SCALE = 0x3; static final int FLAG_DOZE_SCALE = 0x4;
static final int FLAG_USER_SET = 0x4; static final int FLAG_USER_SET = 0x8;
static final int FLAG_IDLE_CURVE = 0x16;
public final BrightnessReason reason = new BrightnessReason(); public final BrightnessReason reason = new BrightnessReason();
@@ -2843,7 +2844,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
return ((flags & FLAG_USER_SET) != 0 ? "user_set " : "") return ((flags & FLAG_USER_SET) != 0 ? "user_set " : "")
+ ((flags & FLAG_RBC) != 0 ? "rbc " : "") + ((flags & FLAG_RBC) != 0 ? "rbc " : "")
+ ((flags & FLAG_INVALID_LUX) != 0 ? "invalid_lux " : "") + ((flags & FLAG_INVALID_LUX) != 0 ? "invalid_lux " : "")
+ ((flags & FLAG_DOZE_SCALE) != 0 ? "doze_scale " : ""); + ((flags & FLAG_DOZE_SCALE) != 0 ? "doze_scale " : "")
+ ((flags & FLAG_DOZE_SCALE) != 0 ? "idle_curve " : "");
} }
} }