Merge "Add tracing for registration/deregistration of ContentObservers" into main (70513a63) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/util/settings/SettingsProxy.kt

+12 −6

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import android.content.ContentResolver
		import android.database.ContentObserver
		import android.net.Uri
		import android.provider.Settings.SettingNotFoundException
		import com.android.app.tracing.TraceUtils.trace
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.launch
		@@ -161,7 +162,10 @@ interface SettingsProxy {
		notifyForDescendants: Boolean,
		settingsObserver: ContentObserver
		) {
		getContentResolver().registerContentObserver(uri, notifyForDescendants, settingsObserver)
		trace({ "SP#registerObserver#[$uri]" }) {
		getContentResolver()
		.registerContentObserver(uri, notifyForDescendants, settingsObserver)
		}
		}

		/**
		@@ -191,13 +195,15 @@ interface SettingsProxy {
		settingsObserver: ContentObserver
		) =
		CoroutineScope(getBackgroundDispatcher()).launch {
		getContentResolver()
		.registerContentObserver(uri, notifyForDescendants, settingsObserver)
		registerContentObserverSync(uri, notifyForDescendants, settingsObserver)
		}

		/** See [ContentResolver.unregisterContentObserver]. */
		fun unregisterContentObserverSync(settingsObserver: ContentObserver) =
		fun unregisterContentObserverSync(settingsObserver: ContentObserver) {
		trace({ "SP#unregisterObserver" }) {
		getContentResolver().unregisterContentObserver(settingsObserver)
		}
		}

		/**
		* Convenience wrapper around [ContentResolver.unregisterContentObserver].'
		@@ -217,7 +223,7 @@ interface SettingsProxy {
		*/
		fun unregisterContentObserverAsync(settingsObserver: ContentObserver) =
		CoroutineScope(getBackgroundDispatcher()).launch {
		unregisterContentObserver(settingsObserver)
		unregisterContentObserverSync(settingsObserver)
		}

		/**