diff options
| author | 2025-03-04 04:42:42 -0800 | |
|---|---|---|
| committer | 2025-03-04 04:42:42 -0800 | |
| commit | 0cbc794abd776f524a2f35dfe4ecdf5eda09e4ec (patch) | |
| tree | 20d83a024d608a5600e2d0109782e1520a22323a | |
| parent | 0bf821f5b1783bc86e3747393dde4f9610c2e745 (diff) | |
| parent | bd29cc159bf6283622c013e4f4fa08e0b0af5bd6 (diff) | |
Merge "feat(EDT): Sync force invert callback register by IfThisThenThat Lint" into main
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/UiModeManagerService.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 98e6cdde664a..7dc96f21b5ae 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1836,6 +1836,7 @@ public final class ViewRootImpl implements ViewParent, eventsToBeRegistered, mBasePackageName); + // LINT.IfChange(fi_cb) if (forceInvertColor()) { if (mForceInvertObserver == null) { mForceInvertObserver = new ContentObserver(mHandler) { @@ -1844,7 +1845,6 @@ public final class ViewRootImpl implements ViewParent, updateForceDarkMode(); } }; - final Uri[] urisToObserve = { Settings.Secure.getUriFor( Settings.Secure.ACCESSIBILITY_FORCE_INVERT_COLOR_ENABLED), @@ -1859,6 +1859,7 @@ public final class ViewRootImpl implements ViewParent, } } } + // LINT.ThenChange(/services/core/java/com/android/server/UiModeManagerService.java:fi_cb) } /** diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index 296f7cfe93ba..f54027ec0272 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java @@ -514,6 +514,7 @@ final class UiModeManagerService extends SystemService { mCarModeEnabled = mDockState == Intent.EXTRA_DOCK_STATE_CAR; registerVrStateListener(); // register listeners + // LINT.IfChange(fi_cb) context.getContentResolver() .registerContentObserver(Secure.getUriFor(Secure.UI_NIGHT_MODE), false, mDarkThemeObserver, 0); @@ -523,6 +524,7 @@ final class UiModeManagerService extends SystemService { Secure.getUriFor(ACCESSIBILITY_FORCE_INVERT_COLOR_ENABLED), false, mForceInvertStateObserver, UserHandle.USER_ALL); } + // LINT.ThenChange(/core/java/android/view/ViewRootImpl.java:fi_cb) context.getContentResolver().registerContentObserver( Secure.getUriFor(Secure.CONTRAST_LEVEL), false, mContrastObserver, UserHandle.USER_ALL); |