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

Commit f6ad5c42 authored by Oleg Blinnikov's avatar Oleg Blinnikov Committed by Android (Google) Code Review
Browse files

Merge "Remove `enable_apply_display_changed_during_display_added`." into main

parents fc654a19 43ee28a1

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

+1 −3
Original line number Diff line number Diff line
@@ -2481,9 +2481,7 @@ public final class DisplayManagerService extends SystemService { 


        mExternalDisplayPolicy.handleLogicalDisplayContentModeChange(display);



        if (mFlags.isApplyDisplayChangedDuringDisplayAddedEnabled()) {

        applyDisplayChangedLocked(display);

        }



        // The default display should always be added to the topology. Other displays will be added

        // upon calling onDisplayBelongToTopologyChanged().

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

+0 −13
Original line number Diff line number Diff line
@@ -179,11 +179,6 @@ public class DisplayManagerFlags { 
            Flags::blockAutobrightnessChangesOnStylusUsage

    );



    private final FlagState mEnableApplyDisplayChangedDuringDisplayAdded = new FlagState(

            Flags.FLAG_ENABLE_APPLY_DISPLAY_CHANGED_DURING_DISPLAY_ADDED,

            Flags::enableApplyDisplayChangedDuringDisplayAdded

    );



    private final FlagState mEnableBatteryStatsForAllDisplays = new FlagState(

            Flags.FLAG_ENABLE_BATTERY_STATS_FOR_ALL_DISPLAYS,

            Flags::enableBatteryStatsForAllDisplays
@@ -467,13 +462,6 @@ public class DisplayManagerFlags { 
        return mEnableBatteryStatsForAllDisplays.isEnabled();

    }



    /**

      * @return {@code true} if need to apply display changes during display added event.

      */

    public boolean isApplyDisplayChangedDuringDisplayAddedEnabled() {

        return mEnableApplyDisplayChangedDuringDisplayAdded.isEnabled();

    }



    /**

     * @return {@code true} if autobrightness is to be blocked when stylus is being used

     */
@@ -640,7 +628,6 @@ public class DisplayManagerFlags { 
        pw.println(" " + mVirtualDisplayLimit);

        pw.println(" " + mNormalBrightnessForDozeParameter);

        pw.println(" " + mEnableBatteryStatsForAllDisplays);

        pw.println(" " + mEnableApplyDisplayChangedDuringDisplayAdded);

        pw.println(" " + mBlockAutobrightnessChangesOnStylusUsage);

        pw.println(" " + mHasArrSupport);

        pw.println(" " + mAutoBrightnessModeBedtimeWearFlagState);

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

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

}



flag {

    name: "enable_apply_display_changed_during_display_added"

    namespace: "display_manager"

    description: "Apply display changes after display added"

    bug: "368131655"

    is_fixed_read_only: true

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "block_autobrightness_changes_on_stylus_usage"

    namespace: "display_manager"

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

+0 −1
Original line number Diff line number Diff line
@@ -3000,7 +3000,6 @@ public class DisplayManagerServiceTest { 


    @Test

    public void testConnectExternalDisplay_allowsEnableAndDisableDisplay() {

        when(mMockFlags.isApplyDisplayChangedDuringDisplayAddedEnabled()).thenReturn(true);

        manageDisplaysPermission(/* granted= */ true);

        BatteryStatsService.overrideService(mMockedBatteryStats);

        DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector);