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

Commit 793ddfa8 authored by Silvia Vinyes's avatar Silvia Vinyes Committed by Automerger Merge Worker
Browse files

Merge "Ensure only internal display display interactions are logged." into... 

Merge "Ensure only internal display display interactions are logged." into tm-qpr-dev am: 6bb34e9b

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



Change-Id: I6a7226bd87e9c1d7e4d90e262a49044db41f3a44
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84dea874 6bb34e9b

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

+16 −12
Original line number Diff line number Diff line
@@ -2810,6 +2810,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


        float appliedPowerFactor = event.isLowPowerModeSet() ? event.powerFactor : -1f;



        if (mLogicalDisplay.getPrimaryDisplayDeviceLocked() != null

                && mLogicalDisplay.getPrimaryDisplayDeviceLocked()

                    .getDisplayDeviceInfoLocked().type == Display.TYPE_INTERNAL) {

            FrameworkStatsLog.write(FrameworkStatsLog.DISPLAY_BRIGHTNESS_CHANGED,

                    convertToNits(event.initialBrightness),

                    convertToNits(event.brightness),
@@ -2823,6 +2826,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    event.automaticBrightnessEnabled,

                    FrameworkStatsLog.DISPLAY_BRIGHTNESS_CHANGED__REASON__REASON_MANUAL);

        }

    }



    class BrightnessEvent {

        static final int FLAG_RBC = 0x1;