Merge "Add critical sections to avoid ConcurrentModificationException" into main (e84eb60b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/communal/widgets/CommunalAppWidgetHost.kt

+16 −4

Original line number	Diff line number	Diff line
		@@ -83,26 +83,38 @@ class CommunalAppWidgetHost(
		override fun allocateAppWidgetId(): Int {
		return super.allocateAppWidgetId().also { appWidgetId ->
		backgroundScope.launch {
		synchronized(observers) {
		observers.forEach { observer -> observer.onAllocateAppWidgetId(appWidgetId) }
		}
		}
		}
		}

		override fun deleteAppWidgetId(appWidgetId: Int) {
		super.deleteAppWidgetId(appWidgetId)
		backgroundScope.launch {
		synchronized(observers) {
		observers.forEach { observer -> observer.onDeleteAppWidgetId(appWidgetId) }
		}
		}
		}

		override fun startListening() {
		super.startListening()
		backgroundScope.launch { observers.forEach { observer -> observer.onHostStartListening() } }
		backgroundScope.launch {
		synchronized(observers) {
		observers.forEach { observer -> observer.onHostStartListening() }
		}
		}
		}

		override fun stopListening() {
		super.stopListening()
		backgroundScope.launch { observers.forEach { observer -> observer.onHostStopListening() } }
		backgroundScope.launch {
		synchronized(observers) {
		observers.forEach { observer -> observer.onHostStopListening() }
		}
		}
		}

		fun addObserver(observer: Observer) {