diff --git a/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java b/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java index 6e56965c3ef..cd62e7bd391 100644 --- a/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java +++ b/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java @@ -17,10 +17,10 @@ package com.android.settings.connecteddevice.display; import static android.content.Context.DISPLAY_SERVICE; import static android.hardware.display.DisplayManager.DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED; -import static android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_ADDED; -import static android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_CHANGED; -import static android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_REMOVED; -import static android.hardware.display.DisplayManager.PRIVATE_EVENT_FLAG_DISPLAY_CONNECTION_CHANGED; +import static android.hardware.display.DisplayManager.EVENT_TYPE_DISPLAY_ADDED; +import static android.hardware.display.DisplayManager.EVENT_TYPE_DISPLAY_CHANGED; +import static android.hardware.display.DisplayManager.EVENT_TYPE_DISPLAY_REMOVED; +import static android.hardware.display.DisplayManager.PRIVATE_EVENT_TYPE_DISPLAY_CONNECTION_CHANGED; import static android.view.Display.INVALID_DISPLAY; import static com.android.server.display.feature.flags.Flags.enableModeLimitForExternalDisplay; @@ -158,9 +158,9 @@ public class ExternalDisplaySettingsConfiguration { if (dm == null) { return; } - dm.registerDisplayListener(listener, mHandler, EVENT_FLAG_DISPLAY_ADDED - | EVENT_FLAG_DISPLAY_CHANGED | EVENT_FLAG_DISPLAY_REMOVED, - PRIVATE_EVENT_FLAG_DISPLAY_CONNECTION_CHANGED); + dm.registerDisplayListener(listener, mHandler, EVENT_TYPE_DISPLAY_ADDED + | EVENT_TYPE_DISPLAY_CHANGED | EVENT_TYPE_DISPLAY_REMOVED, + PRIVATE_EVENT_TYPE_DISPLAY_CONNECTION_CHANGED); } /** diff --git a/src/com/android/settings/display/BrightnessLevelPreference.kt b/src/com/android/settings/display/BrightnessLevelPreference.kt index 73a2280ee9e..aeb0df66aeb 100644 --- a/src/com/android/settings/display/BrightnessLevelPreference.kt +++ b/src/com/android/settings/display/BrightnessLevelPreference.kt @@ -128,7 +128,7 @@ class BrightnessLevelPreference : this, HandlerExecutor.main, /* eventFlags= */ 0, - DisplayManager.PRIVATE_EVENT_FLAG_DISPLAY_BRIGHTNESS, + DisplayManager.PRIVATE_EVENT_TYPE_DISPLAY_BRIGHTNESS, ) } diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index 269114643fb..2b6e5f6aa1f 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -134,7 +134,7 @@ public class BrightnessLevelPreferenceController extends BasePreferenceControlle public void onStart() { mContentResolver.registerContentObserver(BRIGHTNESS_ADJ_URI, false, mBrightnessObserver); mDisplayManager.registerDisplayListener(mDisplayListener, mHandler, /* eventFlags= */ 0, - DisplayManager.PRIVATE_EVENT_FLAG_DISPLAY_BRIGHTNESS); + DisplayManager.PRIVATE_EVENT_TYPE_DISPLAY_BRIGHTNESS); updatedSummary(mPreference); }