Merge "Clean up `register_content_observers_async` flag" into main (f5d5847f) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -1303,16 +1303,6 @@ flag {
		bug: "345227709"
		}

		flag {
		namespace: "systemui"
		name: "register_content_observers_async"
		description: "Use new Async API to register content observers"
		bug: "316922634"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "msdl_feedback"
		namespace: "systemui"

packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java

+3 −12

Original line number	Diff line number	Diff line
		@@ -441,11 +441,7 @@ public class DozeSensors {
		}

		if (!anyListening) {
		if (Flags.registerContentObserversAsync()) {
		mSecureSettings.unregisterContentObserverAsync(mSettingsObserver);
		} else {
		mSecureSettings.unregisterContentObserverSync(mSettingsObserver);
		}
		} else if (!mSettingRegistered) {
		for (TriggerSensor s : mTriggerSensors) {
		s.registerSettingsObserver(mSettingsObserver);
		@@ -769,13 +765,8 @@ public class DozeSensors {

		public void registerSettingsObserver(ContentObserver settingsObserver) {
		if (mConfigured && !TextUtils.isEmpty(mSetting)) {
		if (Flags.registerContentObserversAsync()) {
		mSecureSettings.registerContentObserverForUserAsync(
		mSetting, mSettingsObserver, UserHandle.USER_ALL);
		} else {
		mSecureSettings.registerContentObserverForUserSync(
		mSetting, mSettingsObserver, UserHandle.USER_ALL);
		}
		}
		}

packages/SystemUI/src/com/android/systemui/qs/ReduceBrightColorsControllerImpl.java

+8 −25

Original line number	Diff line number	Diff line
		@@ -78,17 +78,10 @@ public class ReduceBrightColorsControllerImpl implements
		public void onUserChanged(int newUser, Context userContext) {
		synchronized (mListeners) {
		if (mListeners.size() > 0) {
		if (com.android.systemui.Flags.registerContentObserversAsync()) {
		mSecureSettings.unregisterContentObserverAsync(mContentObserver);
		mSecureSettings.registerContentObserverForUserAsync(
		Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED,
		false, mContentObserver, newUser);
		} else {
		mSecureSettings.unregisterContentObserverSync(mContentObserver);
		mSecureSettings.registerContentObserverForUserSync(
		Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED,
		false, mContentObserver, newUser);
		}
		}
		}
		}
		@@ -102,15 +95,9 @@ public class ReduceBrightColorsControllerImpl implements
		if (!mListeners.contains(listener)) {
		mListeners.add(listener);
		if (mListeners.size() == 1) {
		if (com.android.systemui.Flags.registerContentObserversAsync()) {
		mSecureSettings.registerContentObserverForUserAsync(
		Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED,
		false, mContentObserver, mUserTracker.getUserId());
		} else {
		mSecureSettings.registerContentObserverForUserSync(
		Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED,
		false, mContentObserver, mUserTracker.getUserId());
		}
		}
		}
		}
		@@ -120,11 +107,7 @@ public class ReduceBrightColorsControllerImpl implements
		public void removeCallback(@androidx.annotation.NonNull Listener listener) {
		synchronized (mListeners) {
		if (mListeners.remove(listener) && mListeners.size() == 0) {
		if (com.android.systemui.Flags.registerContentObserversAsync()) {
		mSecureSettings.unregisterContentObserverAsync(mContentObserver);
		} else {
		mSecureSettings.unregisterContentObserverSync(mContentObserver);
		}
		}
		}
		}

packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java

+4 −14

Original line number	Diff line number	Diff line
		@@ -147,24 +147,14 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
		public void startObserving() {
		if (!mObserving) {
		mObserving = true;
		if (Flags.registerContentObserversAsync()) {
		mSecureSettings.registerContentObserverForUserAsync(
		BRIGHTNESS_MODE_URI,
		false, this, UserHandle.USER_ALL);
		} else {
		mSecureSettings.registerContentObserverForUserSync(
		BRIGHTNESS_MODE_URI,
		false, this, UserHandle.USER_ALL);
		}
		}
		}

		public void stopObserving() {
		if (Flags.registerContentObserversAsync()) {
		mSecureSettings.unregisterContentObserverAsync(this);
		} else {
		mSecureSettings.unregisterContentObserverSync(this);
		}
		mObserving = false;
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java

+9 −19

Original line number	Diff line number	Diff line
		@@ -518,7 +518,6 @@ public class DozeParameters implements
		}

		void observe() {
		if (Flags.registerContentObserversAsync()) {
		mSecureSettings.registerContentObserverForUserAsync(mQuickPickupGesture,
		this, UserHandle.USER_ALL);
		mSecureSettings.registerContentObserverForUserAsync(mPickupGesture,
		@@ -528,15 +527,6 @@ public class DozeParameters implements
		// The register calls are called in order, so this ensures that update()
		// is called after them all and value retrieval isn't racy.
		() -> mHandler.post(() -> update(null)));
		} else {
		ContentResolver resolver = mContext.getContentResolver();
		resolver.registerContentObserver(mQuickPickupGesture, false, this,
		UserHandle.USER_ALL);
		resolver.registerContentObserver(mPickupGesture, false, this, UserHandle.USER_ALL);
		resolver.registerContentObserver(mAlwaysOnEnabled, false, this,
		UserHandle.USER_ALL);
		update(null);
		}
		}

		@Override