From 24f961a07a5c42bb5c3c4bb9024c5d9ab9cfff34 Mon Sep 17 00:00:00 2001 From: Rupesh Bansal Date: Sun, 3 Nov 2024 22:14:35 +0000 Subject: [PATCH] Changed to use the new hidden API. Bug: 372700957 Test: refactoring Flag: EXEMPT Refactoring Change-Id: I5eb7d5ab94ebd273aea9226cd3cbed5de0d49baa --- .../display/ExternalDisplaySettingsConfiguration.java | 6 +++--- .../display/BrightnessLevelPreferenceController.java | 4 ++-- .../settings/display/BrightnessLevelRestrictedPreference.kt | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java b/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java index c9ea8ae0a04..d0427991e42 100644 --- a/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java +++ b/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java @@ -19,8 +19,8 @@ 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_CONNECTION_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.view.Display.INVALID_DISPLAY; import static com.android.server.display.feature.flags.Flags.enableModeLimitForExternalDisplay; @@ -159,8 +159,8 @@ public class ExternalDisplaySettingsConfiguration { return; } dm.registerDisplayListener(listener, mHandler, EVENT_FLAG_DISPLAY_ADDED - | EVENT_FLAG_DISPLAY_CHANGED | EVENT_FLAG_DISPLAY_REMOVED - | EVENT_FLAG_DISPLAY_CONNECTION_CHANGED); + | EVENT_FLAG_DISPLAY_CHANGED | EVENT_FLAG_DISPLAY_REMOVED, + PRIVATE_EVENT_FLAG_DISPLAY_CONNECTION_CHANGED); } /** diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index 9c4af66e783..33579ac38a4 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -133,8 +133,8 @@ public class BrightnessLevelPreferenceController extends BasePreferenceControlle @Override public void onStart() { mContentResolver.registerContentObserver(BRIGHTNESS_ADJ_URI, false, mBrightnessObserver); - mDisplayManager.registerDisplayListener(mDisplayListener, mHandler, - DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS); + mDisplayManager.registerDisplayListener(mDisplayListener, mHandler, /* eventFlags= */ 0, + DisplayManager.PRIVATE_EVENT_FLAG_DISPLAY_BRIGHTNESS); updatedSummary(mPreference); } diff --git a/src/com/android/settings/display/BrightnessLevelRestrictedPreference.kt b/src/com/android/settings/display/BrightnessLevelRestrictedPreference.kt index 09d92ebeee8..4398f210907 100644 --- a/src/com/android/settings/display/BrightnessLevelRestrictedPreference.kt +++ b/src/com/android/settings/display/BrightnessLevelRestrictedPreference.kt @@ -107,7 +107,8 @@ class BrightnessLevelRestrictedPreference : context.displayManager.registerDisplayListener( listener, HandlerExecutor.main, - DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS, + /* eventFlags= */ 0, + DisplayManager.PRIVATE_EVENT_FLAG_DISPLAY_BRIGHTNESS, ) }