PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changing eventFlags to eventFilter" into main

Browse Source
This commit is contained in:
Rupesh Bansal
2024-12-20 21:25:48 -08:00
committed by Android (Google) Code Review
parent a538d07519 74f0acd92b
commit 99b6ebb402
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
View File

@@ -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);
}
/**

2
src/com/android/settings/display/BrightnessLevelPreference.kt
View File

@@ -128,7 +128,7 @@ class BrightnessLevelPreference :
this,
HandlerExecutor.main,
/* eventFlags= */ 0,
DisplayManager.PRIVATE_EVENT_FLAG_DISPLAY_BRIGHTNESS,
DisplayManager.PRIVATE_EVENT_TYPE_DISPLAY_BRIGHTNESS,
)
}

2
src/com/android/settings/display/BrightnessLevelPreferenceController.java
View File

@@ -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);
}