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

Commit 958fbbbd authored by lbill's avatar lbill
Browse files

Tweak DisplayPowerController#animateScreenStateChange() for AoF 

The config_displayBlanksAfterDoze was designed for Doze(AoD) force
display blanks after dozing or not, however the legacy flow

Consideraing Screen Off transition wihout flicker(SmartSpace, Clocks)
Add additional condition : (isOff && targetStateisNotOff) then invoke
prepareColorFade() before screen turning ON.

Flag: com.android.server.display.feature.flags.ensure_color_fade_when_turning_on
Bug: 384986206
Bug: 414931552
Test: Forest
Test: DisplayPowerControllerTest
Test: manual enroll fingerprint and enable screen off unlock
      ensure the unlock from screen off to on do not observe flicker
Change-Id: I5a329af8986f7a2474eebb2ec0a661b9cfd99b8f
parent fef35050

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -2347,6 +2347,14 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            mPendingScreenOff = false;

            mPendingScreenOff = false;

        }

        }





        if (mFlags.isEnsureColorFadeWhenTurningOnEnabled()

                && ((mPowerState.getScreenState() == Display.STATE_OFF)

                && target != Display.STATE_OFF)) {

            // ensure ColorFade is present.

            mPowerState.prepareColorFade(mContext,

                    mColorFadeFadesConfig ? ColorFade.MODE_FADE : ColorFade.MODE_WARM_UP);

        }



        if (mDisplayBlanksAfterDozeConfig

        if (mDisplayBlanksAfterDozeConfig

                && Display.isDozeState(mPowerState.getScreenState())

                && Display.isDozeState(mPowerState.getScreenState())

                && !Display.isDozeState(target)) {

                && !Display.isDozeState(target)) {

services/core/java/com/android/server/display/feature/DisplayManagerFlags.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -309,6 +309,10 @@ public class DisplayManagerFlags { 
            Flags.FLAG_MODE_SWITCH_WITHOUT_SAVING,

            Flags.FLAG_MODE_SWITCH_WITHOUT_SAVING,

            Flags::modeSwitchWithoutSaving

            Flags::modeSwitchWithoutSaving

    );

    );

    private final FlagState mEnsureColorFadeWhenTurningOn = new FlagState(

            Flags.FLAG_ENSURE_COLOR_FADE_WHEN_TURNING_ON,

            Flags::ensureColorFadeWhenTurningOn

    );





    /**

    /**

     * @return {@code true} if 'port' is allowed in display layout configuration file.

     * @return {@code true} if 'port' is allowed in display layout configuration file.
@@ -651,6 +655,13 @@ public class DisplayManagerFlags { 
        return mModeSwitchWithoutSaving.isEnabled();

        return mModeSwitchWithoutSaving.isEnabled();

    }

    }





    /**

     * @return {@code true} if the flag for ensure color fad when turning screen on is enabled

     */

    public boolean isEnsureColorFadeWhenTurningOnEnabled() {

        return mEnsureColorFadeWhenTurningOn.isEnabled();

    }



    /**

    /**

     * dumps all flagstates

     * dumps all flagstates

     * @param pw printWriter

     * @param pw printWriter
@@ -714,6 +725,7 @@ public class DisplayManagerFlags { 
        pw.println(" " + mDispatchDisplayModeWithVsyncOffsets);

        pw.println(" " + mDispatchDisplayModeWithVsyncOffsets);

        pw.println(" " + mEnableDefaultDisplayInTopologySwitch);

        pw.println(" " + mEnableDefaultDisplayInTopologySwitch);

        pw.println(" " + mModeSwitchWithoutSaving);

        pw.println(" " + mModeSwitchWithoutSaving);

        pw.println(" " + mEnsureColorFadeWhenTurningOn);

    }

    }





    private static class FlagState {

    private static class FlagState {

services/core/java/com/android/server/display/feature/display_flags.aconfig

+11 −0
Original line number Original line Diff line number Diff line
@@ -556,3 +556,14 @@ flag { 
    bug: "253296253"

    bug: "253296253"

    is_fixed_read_only: true

    is_fixed_read_only: true

}

}



flag {

    name: "ensure_color_fade_when_turning_on"

    namespace: "biometrics_integration"

    description: "Ensure color fade when turing on screen"

    bug: "384986206"

    is_fixed_read_only: true

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}

services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java

+19 −0
Original line number Original line Diff line number Diff line
@@ -2511,6 +2511,25 @@ public final class DisplayPowerControllerTest { 
        // No crash = success

        // No crash = success

    }

    }





    @Test

    public void testScreenOff_thenTurnOn_ensureColorFade() {

        mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID);



        // Ensure the feature flag is enabled.

        when(mDisplayManagerFlagsMock.isEnsureColorFadeWhenTurningOnEnabled()).thenReturn(true);

        // Ensure the initial screen state is OFF.

        when(mHolder.displayPowerState.getScreenState()).thenReturn(Display.STATE_OFF);



        // Run the DPC logic.

        DisplayPowerRequest dpr = new DisplayPowerRequest();

        dpr.policy = DisplayPowerRequest.POLICY_BRIGHT;

        mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false);

        advanceTime(1); // Run updatePowerState



        // The conditions are met, so prepareColorFade() is invoked.

        verify(mHolder.displayPowerState).prepareColorFade(any(), anyInt());

    }



    /**

    /**

     * Creates a mock and registers it to {@link LocalServices}.

     * Creates a mock and registers it to {@link LocalServices}.

     */

     */