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

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

Merge changes from topic "b/295948590" into main

* changes:
  Renaming DisplayPowerController2 after cleanup
  Removing DisplayPowerController
parents 28209a0c 0f170ad1
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -1830,15 +1830,6 @@ public final class DisplayManager {
         */
        String KEY_POWER_THROTTLING_DATA = "power_throttling_data";

        /**
         * Key for new power controller feature flag. If enabled new DisplayPowerController will
         * be used.
         * Read value via {@link android.provider.DeviceConfig#getBoolean(String, String, boolean)}
         * with {@link android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER} as the namespace.
         * @hide
         */
        String KEY_NEW_POWER_CONTROLLER = "use_newly_structured_display_power_controller";

        /**
         * Key for normal brightness mode controller feature flag.
         * It enables NormalBrightnessModeController.
+4 −11
Original line number Diff line number Diff line
@@ -3390,17 +3390,10 @@ public final class DisplayManagerService extends SystemService {
        // with the corresponding displaydevice.
        HighBrightnessModeMetadata hbmMetadata =
                mHighBrightnessModeMetadataMapper.getHighBrightnessModeMetadataLocked(display);
        if (mConfigParameterProvider.isNewPowerControllerFeatureEnabled()) {
            displayPowerController = new DisplayPowerController2(
                    mContext, /* injector= */ null, mDisplayPowerCallbacks, mPowerHandler,
                    mSensorManager, mDisplayBlanker, display, mBrightnessTracker, brightnessSetting,
                    () -> handleBrightnessChange(display), hbmMetadata, mBootCompleted, mFlags);
        } else {
        displayPowerController = new DisplayPowerController(
                mContext, /* injector= */ null, mDisplayPowerCallbacks, mPowerHandler,
                mSensorManager, mDisplayBlanker, display, mBrightnessTracker, brightnessSetting,
                () -> handleBrightnessChange(display), hbmMetadata, mBootCompleted, mFlags);
        }
        mDisplayPowerControllers.append(display.getDisplayIdLocked(), displayPowerController);
        return displayPowerController;
    }
+637 −1121

File changed.

Preview size limit exceeded, changes collapsed.

+0 −3267

File deleted.

Preview size limit exceeded, changes collapsed.

+0 −7
Original line number Diff line number Diff line
@@ -41,13 +41,6 @@ public class DeviceConfigParameterProvider {
        mDeviceConfig = deviceConfig;
    }

    // feature: revamping_display_power_controller_feature
    // parameter: use_newly_structured_display_power_controller
    public boolean isNewPowerControllerFeatureEnabled() {
        return mDeviceConfig.getBoolean(DeviceConfig.NAMESPACE_DISPLAY_MANAGER,
                DisplayManager.DeviceConfig.KEY_NEW_POWER_CONTROLLER, true);
    }

    // feature: hdr_output_control
    // parameter: enable_hdr_output_control
    public boolean isHdrOutputControlFeatureEnabled() {
Loading