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

Commit 8f318ace authored by Oleg Blinnikov's avatar Oleg Blinnikov
Browse files

Remove: enable_waiting_confirmation_before_mirroring 

Flag has been in production for almost a year.

Bug: 409612488
Flag: EXEMPT flag removal
Test: atest ExternalDisplayPolicyTest
Change-Id: Ifd450bcf97db667674f2706156378e5a6f6fde4c
parent 03499bba

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

+0 −8
Original line number Diff line number Diff line
@@ -368,14 +368,6 @@ class ExternalDisplayPolicy { 
    }



    boolean isDisplayReadyForMirroring(int displayId) {

        if (!mFlags.isWaitingConfirmationBeforeMirroringEnabled()) {

            if (DEBUG) {

                Slog.d(TAG, "isDisplayReadyForMirroring: mirroring CONFIRMED - "

                        + " flag 'waiting for confirmation before mirroring' is disabled");

            }

            return true;

        }



        synchronized (mSyncRoot) {

            if (!mIsBootCompleted) {

                if (DEBUG) {

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

+0 −14
Original line number Diff line number Diff line
@@ -203,11 +203,6 @@ public class DisplayManagerFlags { 
            Flags::enableUserRefreshRateForExternalDisplay

    );



    private final FlagState mEnableWaitingConfirmationBeforeMirroring = new FlagState(

            Flags.FLAG_ENABLE_WAITING_CONFIRMATION_BEFORE_MIRRORING,

            Flags::enableWaitingConfirmationBeforeMirroring

    );



    private final FlagState mEnableApplyDisplayChangedDuringDisplayAdded = new FlagState(

            Flags.FLAG_ENABLE_APPLY_DISPLAY_CHANGED_DURING_DISPLAY_ADDED,

            Flags::enableApplyDisplayChangedDuringDisplayAdded
@@ -514,14 +509,6 @@ public class DisplayManagerFlags { 
                com.android.internal.R.bool.config_allowNormalBrightnessForDozePolicy);

    }



    /**

      * @return {@code true} if mirroring won't be enabled until boot completes and the user enables

      * the display.

      */

    public boolean isWaitingConfirmationBeforeMirroringEnabled() {

        return mEnableWaitingConfirmationBeforeMirroring.isEnabled();

    }



    /**

      * @return {@code true} if battery stats is enabled for all displays, not just the primary

      * display.
@@ -713,7 +700,6 @@ public class DisplayManagerFlags { 
        pw.println(" " + mNewHdrBrightnessModifier);

        pw.println(" " + mVirtualDisplayLimit);

        pw.println(" " + mNormalBrightnessForDozeParameter);

        pw.println(" " + mEnableWaitingConfirmationBeforeMirroring);

        pw.println(" " + mEnableBatteryStatsForAllDisplays);

        pw.println(" " + mEnableApplyDisplayChangedDuringDisplayAdded);

        pw.println(" " + mBlockAutobrightnessChangesOnStylusUsage);

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

+0 −11
Original line number Diff line number Diff line
@@ -311,17 +311,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    name: "enable_waiting_confirmation_before_mirroring"

    namespace: "display_manager"

    description: "Allow ContentRecorder checking whether user confirmed mirroring after boot"

    bug: "361698995"

    is_fixed_read_only: true

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "enable_battery_stats_for_all_displays"

    namespace: "display_manager"

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

+0 −11
Original line number Diff line number Diff line
@@ -289,15 +289,8 @@ public class ExternalDisplayPolicyTest { 
        verify(mMockedLogicalDisplayMapper, never()).forEachLocked(any());

    }



    @Test

    public void testMirroringAlwaysConfirmedByUser_flagDisabled() {

        when(mMockedFlags.isWaitingConfirmationBeforeMirroringEnabled()).thenReturn(false);

        assertThat(mExternalDisplayPolicy.isDisplayReadyForMirroring(EXTERNAL_DISPLAY_ID)).isTrue();

    }



    @Test

    public void testMirroringConfirmed_afterBootForEnabledDisplay() {

        when(mMockedFlags.isWaitingConfirmationBeforeMirroringEnabled()).thenReturn(true);

        mExternalDisplayPolicy.onBootCompleted();

        assertThat(mExternalDisplayPolicy.isDisplayReadyForMirroring(EXTERNAL_DISPLAY_ID))

                .isTrue();
@@ -305,7 +298,6 @@ public class ExternalDisplayPolicyTest { 


    @Test

    public void testMirroringNotConfirmed_afterBootForDisabledDisplay() {

        when(mMockedFlags.isWaitingConfirmationBeforeMirroringEnabled()).thenReturn(true);

        mExternalDisplayPolicy.onBootCompleted();

        when(mMockedLogicalDisplay.isEnabledLocked()).thenReturn(false);

        assertThat(mExternalDisplayPolicy.isDisplayReadyForMirroring(EXTERNAL_DISPLAY_ID))
@@ -314,7 +306,6 @@ public class ExternalDisplayPolicyTest { 


    @Test

    public void testMirroringNeverConfirmed_forNonExternalDisplays() {

        when(mMockedFlags.isWaitingConfirmationBeforeMirroringEnabled()).thenReturn(true);

        mExternalDisplayPolicy.onBootCompleted();

        assertThat(mExternalDisplayPolicy.isDisplayReadyForMirroring(Display.DEFAULT_DISPLAY))

                .isFalse();
@@ -322,7 +313,6 @@ public class ExternalDisplayPolicyTest { 


    @Test

    public void testMirroringNeverConfirmed_forNonExistingDisplays() {

        when(mMockedFlags.isWaitingConfirmationBeforeMirroringEnabled()).thenReturn(true);

        mExternalDisplayPolicy.onBootCompleted();

        assertThat(mExternalDisplayPolicy.isDisplayReadyForMirroring(Display.INVALID_DISPLAY))

                .isFalse();
@@ -330,7 +320,6 @@ public class ExternalDisplayPolicyTest { 


    @Test

    public void testMirroringNeverConfirmed_duringBoot() {

        when(mMockedFlags.isWaitingConfirmationBeforeMirroringEnabled()).thenReturn(true);

        assertThat(mExternalDisplayPolicy.isDisplayReadyForMirroring(EXTERNAL_DISPLAY_ID))

                .isFalse();

    }