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

Commit 7529d98e authored by Oleg Petšjonkin's avatar Oleg Petšjonkin Committed by Android (Google) Code Review
Browse files

Merge "HdrClamper should be enabled with 0 minHdrPercentOfScreen" into main

parents 74113380 98f9e2f5

services/core/java/com/android/server/display/brightness/clamper/HdrClamper.java

+5 −3
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ public class HdrClamper { 
    public void resetHdrConfig(HdrBrightnessData data, int width, int height,

            float minimumHdrPercentOfScreen, IBinder displayToken) {

        mHdrBrightnessData = data;

        mHdrListener.mHdrMinPixels = minimumHdrPercentOfScreen <= 0 ? -1

                : (float) (width * height) * minimumHdrPercentOfScreen;

        mHdrListener.mHdrMinPixels = (float) (width * height) * minimumHdrPercentOfScreen;

        if (displayToken != mRegisteredDisplayToken) { // token changed, resubscribe

            if (mRegisteredDisplayToken != null) { // previous token not null, unsubscribe

                mHdrListener.unregister(mRegisteredDisplayToken);
@@ -115,7 +114,7 @@ public class HdrClamper { 
            // new token not null and hdr min % of the screen is set, subscribe.

            // e.g. for virtual display, HBM data will be missing and HdrListener

            // should not be registered

            if (displayToken != null && mHdrListener.mHdrMinPixels > 0) {

            if (displayToken != null && mHdrListener.mHdrMinPixels >= 0) {

                mHdrListener.register(displayToken);

                mRegisteredDisplayToken = displayToken;

            }
@@ -140,8 +139,11 @@ public class HdrClamper { 
        pw.println("  mDesiredMaxBrightness=" + mDesiredMaxBrightness);

        pw.println("  mTransitionRate=" + mTransitionRate);

        pw.println("  mDesiredTransitionRate=" + mDesiredTransitionRate);

        pw.println("  mHdrVisible=" + mHdrVisible);

        pw.println("  mHdrListener.mHdrMinPixels=" + mHdrListener.mHdrMinPixels);

        pw.println("  mHdrBrightnessData=" + (mHdrBrightnessData == null ? "null"

                : mHdrBrightnessData.toString()));

        pw.println("  mHdrListener registered=" + (mRegisteredDisplayToken != null));

        pw.println("  mAmbientLux=" + mAmbientLux);

    }

services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/HdrClamperTest.java

+10 −0
Original line number Diff line number Diff line
@@ -121,6 +121,16 @@ public class HdrClamperTest { 
        verify(mMockHdrInfoListener, times(1)).register(mMockBinder);

    }



    @Test

    public void testRegisterHdrListener_ZeroMinHdrPercent() {

        IBinder otherBinder = mock(IBinder.class);

        mHdrClamper.resetHdrConfig(TEST_HDR_DATA, WIDTH, HEIGHT,

            /* minimumHdrPercentOfScreen= */ 0, otherBinder);



        verify(mMockHdrInfoListener).unregister(mMockBinder);

        verify(mMockHdrInfoListener).register(otherBinder);

    }



    @Test

    public void testRegisterNotCalledIfHbmConfigIsMissing() {

        IBinder otherBinder = mock(IBinder.class);