Merge "Adds useful message to UserSettingsProxy." into main (abccf87d) · Commits · e / os / android_frameworks_base

packages/SystemUI/pods/com/android/systemui/util/settings/UserSettingsProxy.kt

+35 −15

Original line number	Diff line number	Diff line
		@@ -157,7 +157,11 @@ interface UserSettingsProxy : SettingsProxy {
		userHandle: Int,
		) =
		settingsScope.launch("registerContentObserverForUserAsync-A") {
		try {
		registerContentObserverForUserSync(getUriFor(name), settingsObserver, userHandle)
		} catch (e: SecurityException) {
		throw SecurityException("registerContentObserverForUserAsync-A, name: $name", e)
		}
		}

		/** Convenience wrapper around [ContentResolver.registerContentObserver] */
		@@ -198,7 +202,11 @@ interface UserSettingsProxy : SettingsProxy {
		userHandle: Int,
		) =
		settingsScope.launch("registerContentObserverForUserAsync-B") {
		try {
		registerContentObserverForUserSync(uri, settingsObserver, userHandle)
		} catch (e: SecurityException) {
		throw SecurityException("registerContentObserverForUserAsync-B, uri: $uri", e)
		}
		}

		/**
		@@ -215,7 +223,11 @@ interface UserSettingsProxy : SettingsProxy {
		@WorkerThread registered: Runnable,
		) =
		settingsScope.launch("registerContentObserverForUserAsync-C") {
		try {
		registerContentObserverForUserSync(uri, settingsObserver, userHandle)
		} catch (e: SecurityException) {
		throw SecurityException("registerContentObserverForUserAsync-C, uri: $uri", e)
		}
		registered.run()
		}

		@@ -274,12 +286,16 @@ interface UserSettingsProxy : SettingsProxy {
		userHandle: Int,
		) {
		settingsScope.launch("registerContentObserverForUserAsync-D") {
		try {
		registerContentObserverForUserSync(
		getUriFor(name),
		notifyForDescendants,
		settingsObserver,
		userHandle,
		)
		} catch (e: SecurityException) {
		throw SecurityException("registerContentObserverForUserAsync-D, name: $name", e)
		}
		}
		}

		@@ -338,12 +354,16 @@ interface UserSettingsProxy : SettingsProxy {
		userHandle: Int,
		) =
		settingsScope.launch("registerContentObserverForUserAsync-E") {
		try {
		registerContentObserverForUserSync(
		uri,
		notifyForDescendants,
		settingsObserver,
		userHandle,
		)
		} catch (e: SecurityException) {
		throw SecurityException("registerContentObserverForUserAsync-E, uri: $uri", e)
		}
		}

		/**