From bd29cc159bf6283622c013e4f4fa08e0b0af5bd6 Mon Sep 17 00:00:00 2001 From: Menghan Li Date: Fri, 21 Feb 2025 02:09:50 +0000 Subject: feat(EDT): Sync force invert callback register by IfThisThenThat Lint Add labeled blocks to both UiModeManagerService and ViewRootImpl to clearly mark the code sections responsible for registering the ContentObserver. Bug: 368721320 Flag: android.view.accessibility.force_invert_color Test: manual testing Change-Id: I13c8c42a3094a17cc0d4e189757eb35562e7abc9 --- core/java/android/view/ViewRootImpl.java | 3 ++- services/core/java/com/android/server/UiModeManagerService.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index e157da72196a..c89c20d0e2da 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); -- cgit v1.2.3-59-g8ed1b