Merge "Synchronize listeners in ConfigurationControllerImpl" into main (24b59fca) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.kt

+13 −5

Original line number	Diff line number	Diff line
		@@ -59,7 +59,10 @@ class ConfigurationControllerImpl @Inject constructor(
		}

		override fun notifyThemeChanged() {
		val listeners = ArrayList(listeners)
		// Avoid concurrent modification exception
		val listeners = synchronized(this.listeners) {
		ArrayList(this.listeners)
		}

		listeners.filterForEach({ this.listeners.contains(it) }) {
		it.onThemeChanged()
		@@ -68,8 +71,9 @@ class ConfigurationControllerImpl @Inject constructor(

		override fun onConfigurationChanged(newConfig: Configuration) {
		// Avoid concurrent modification exception
		val listeners = ArrayList(listeners)

		val listeners = synchronized(this.listeners) {
		ArrayList(this.listeners)
		}
		listeners.filterForEach({ this.listeners.contains(it) }) {
		it.onConfigChanged(newConfig)
		}
		@@ -148,13 +152,17 @@ class ConfigurationControllerImpl @Inject constructor(
		}

		override fun addCallback(listener: ConfigurationListener) {
		synchronized(listeners) {
		listeners.add(listener)
		}
		listener.onDensityOrFontScaleChanged()
		}

		override fun removeCallback(listener: ConfigurationListener) {
		synchronized(listeners) {
		listeners.remove(listener)
		}
		}

		override fun isLayoutRtl(): Boolean {
		return layoutDirection == LAYOUT_DIRECTION_RTL