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

Commit 33c9b336 authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Add logging for rbc on / off" into udc-dev am: 7c0f7188 am: 3113e628 am: 90995f4c 

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



Change-Id: Ib5650f5f10ba840bf7de895f5933081cfda5e9e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b8fd641 90995f4c

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

+1 −0
Original line number Diff line number Diff line
@@ -796,6 +796,7 @@ public class BrightnessTracker { 
                pw.print(", isUserSetBrightness=" + events[i].isUserSetBrightness);

                pw.print(", powerBrightnessFactor=" + events[i].powerBrightnessFactor);

                pw.print(", isDefaultBrightnessConfig=" + events[i].isDefaultBrightnessConfig);

                pw.print(", recent lux values=");

                pw.print(" {");

                for (int j = 0; j < events[i].luxValues.length; ++j){

                    if (j != 0) {

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

+29 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    private static final int REPORTED_TO_POLICY_SCREEN_TURNING_OFF = 3;



    private static final int RINGBUFFER_MAX = 100;

    private static final int RINGBUFFER_RBC_MAX = 20;



    private static final float[] BRIGHTNESS_RANGE_BOUNDARIES = {

        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 20, 30, 40, 50, 60, 70, 80,
@@ -390,6 +391,10 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    // Keeps a record of brightness changes for dumpsys.

    private RingBuffer<BrightnessEvent> mBrightnessEventRingBuffer;



    // Keeps a record of rbc changes for dumpsys.

    private final RingBuffer<BrightnessEvent> mRbcEventRingBuffer =

            new RingBuffer<>(BrightnessEvent.class, RINGBUFFER_RBC_MAX);



    // Controls and tracks all the wakelocks that are acquired/released by the system. Also acts as

    // a medium of communication between this class and the PowerManagerService.

    private final WakelockController mWakelockController;
@@ -1593,6 +1598,10 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                mTempBrightnessEvent.getReason().getReason() == BrightnessReason.REASON_TEMPORARY

                        && mLastBrightnessEvent.getReason().getReason()

                        == BrightnessReason.REASON_TEMPORARY;

        // Purely for dumpsys;

        final boolean isRbcEvent =

                mLastBrightnessEvent.isRbcEnabled() != mTempBrightnessEvent.isRbcEnabled();



        if ((!mTempBrightnessEvent.equalsMainData(mLastBrightnessEvent) && !tempToTempTransition)

                || brightnessAdjustmentFlags != 0) {

            mTempBrightnessEvent.setInitialBrightness(mLastBrightnessEvent.getBrightness());
@@ -1612,6 +1621,10 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
            if (mBrightnessEventRingBuffer != null) {

                mBrightnessEventRingBuffer.append(newEvent);

            }

            if (isRbcEvent) {

                mRbcEventRingBuffer.append(newEvent);

            }



        }



        // Update display white-balance.
@@ -2359,6 +2372,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
            dumpBrightnessEvents(pw);

        }



        dumpRbcEvents(pw);



        if (mHbmController != null) {

            mHbmController.dump(pw);

        }
@@ -2431,6 +2446,20 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        }

    }



    private void dumpRbcEvents(PrintWriter pw) {

        int size = mRbcEventRingBuffer.size();

        if (size < 1) {

            pw.println("No Reduce Bright Colors Adjustments");

            return;

        }



        pw.println("Reduce Bright Colors Adjustments Last " + size + " Events: ");

        BrightnessEvent[] eventArray = mRbcEventRingBuffer.toArray();

        for (int i = 0; i < mRbcEventRingBuffer.size(); i++) {

            pw.println("  " + eventArray[i]);

        }

    }





    private void noteScreenState(int screenState) {

        // Log screen state change with display id