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

Commit 0f170ad1 authored by petsjonkin's avatar petsjonkin Committed by Oleg Petšjonkin
Browse files

Renaming DisplayPowerController2 after cleanup 

Bug: b/295948590
Test: presumbit, atest com.android.server.display
Change-Id: Ia2cd0ad43f3609ef10aded11811cfba4eb935b73
parent 745c45bf

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

+1 −1
Original line number Diff line number Diff line
@@ -3390,7 +3390,7 @@ public final class DisplayManagerService extends SystemService { 
        // with the corresponding displaydevice.

        HighBrightnessModeMetadata hbmMetadata =

                mHighBrightnessModeMetadataMapper.getHighBrightnessModeMetadataLocked(display);

        displayPowerController = new DisplayPowerController2(

        displayPowerController = new DisplayPowerController(

                mContext, /* injector= */ null, mDisplayPowerCallbacks, mPowerHandler,

                mSensorManager, mDisplayBlanker, display, mBrightnessTracker, brightnessSetting,

                () -> handleBrightnessChange(display), hbmMetadata, mBootCompleted, mFlags);

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

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ import java.util.Objects; 
 * For debugging, you can make the color fade and brightness animations run

 * slower by changing the "animator duration scale" option in Development Settings.

 */

final class DisplayPowerController2 implements AutomaticBrightnessController.Callbacks,

final class DisplayPowerController implements AutomaticBrightnessController.Callbacks,

        DisplayWhiteBalanceController.Callbacks, DisplayPowerControllerInterface {

    private static final String SCREEN_ON_BLOCKED_TRACE_NAME = "Screen on blocked";

    private static final String SCREEN_OFF_BLOCKED_TRACE_NAME = "Screen off blocked";
@@ -488,7 +488,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    /**

     * Creates the display power controller.

     */

    DisplayPowerController2(Context context, Injector injector,

    DisplayPowerController(Context context, Injector injector,

            DisplayPowerCallbacks callbacks, Handler handler,

            SensorManager sensorManager, DisplayBlanker blanker, LogicalDisplay logicalDisplay,

            BrightnessTracker brightnessTracker, BrightnessSetting brightnessSetting,

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

+8 −8
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ import java.util.List; 


@SmallTest

@RunWith(AndroidJUnit4.class)

public final class DisplayPowerController2Test {

public final class DisplayPowerControllerTest {

    private static final int DISPLAY_ID = Display.DEFAULT_DISPLAY;

    private static final String UNIQUE_ID = "unique_id_test123";

    private static final int FOLLOWER_DISPLAY_ID = DISPLAY_ID + 1;
@@ -1739,7 +1739,7 @@ public final class DisplayPowerController2Test { 


        setUpDisplay(displayId, uniqueId, display, device, config, isEnabled);



        final DisplayPowerController2 dpc = new DisplayPowerController2(

        final DisplayPowerController dpc = new DisplayPowerController(

                mContext, injector, mDisplayPowerCallbacksMock, mHandler,

                mSensorManagerMock, mDisplayBlankerMock, display,

                mBrightnessTrackerMock, brightnessSetting, () -> {
@@ -1757,7 +1757,7 @@ public final class DisplayPowerController2Test { 
     * related to it.

     */

    private static class DisplayPowerControllerHolder {

        public final DisplayPowerController2 dpc;

        public final DisplayPowerController dpc;

        public final LogicalDisplay display;

        public final DisplayPowerState displayPowerState;

        public final BrightnessSetting brightnessSetting;
@@ -1771,10 +1771,10 @@ public final class DisplayPowerController2Test { 
        public final BrightnessClamperController clamperController;

        public final HighBrightnessModeMetadata hbmMetadata;

        public final BrightnessMappingStrategy brightnessMappingStrategy;

        public final DisplayPowerController2.Injector injector;

        public final DisplayPowerController.Injector injector;

        public final DisplayDeviceConfig config;



        DisplayPowerControllerHolder(DisplayPowerController2 dpc, LogicalDisplay display,

        DisplayPowerControllerHolder(DisplayPowerController dpc, LogicalDisplay display,

                DisplayPowerState displayPowerState, BrightnessSetting brightnessSetting,

                DualRampAnimator<DisplayPowerState> animator,

                AutomaticBrightnessController automaticBrightnessController,
@@ -1785,7 +1785,7 @@ public final class DisplayPowerController2Test { 
                BrightnessClamperController clamperController,

                HighBrightnessModeMetadata hbmMetadata,

                BrightnessMappingStrategy brightnessMappingStrategy,

                DisplayPowerController2.Injector injector,

                DisplayPowerController.Injector injector,

                DisplayDeviceConfig config) {

            this.dpc = dpc;

            this.display = display;
@@ -1805,7 +1805,7 @@ public final class DisplayPowerController2Test { 
        }

    }



    private class TestInjector extends DisplayPowerController2.Injector {

    private class TestInjector extends DisplayPowerController.Injector {

        private final DisplayPowerState mDisplayPowerState;

        private final DualRampAnimator<DisplayPowerState> mAnimator;

        private final AutomaticBrightnessController mAutomaticBrightnessController;
@@ -1845,7 +1845,7 @@ public final class DisplayPowerController2Test { 
        }



        @Override

        DisplayPowerController2.Clock getClock() {

        DisplayPowerController.Clock getClock() {

            return mClock::now;

        }