Merge "Use null as default argument" (229b996b) · Commits · e / os / android_frameworks_base

packages/SystemUI/docs/broadcasts.md

+7 −7

Original line number	Diff line number	Diff line
		@@ -62,17 +62,17 @@ Acquire the dispatcher by using `@Inject` to obtain a `BroadcastDispatcher`. The
		* @param executor An executor to dispatch [BroadcastReceiver.onReceive]. Pass null to use an
		* executor in the main thread (default).
		* @param user A user handle to determine which broadcast should be dispatched to this receiver.
		* By default, it is the user of the context (system user in SystemUI).
		* Pass `null` to use the user of the context (system user in SystemUI).
		* @throws IllegalArgumentException if the filter has other constraints that are not actions or
		* categories or the filter has no actions.
		*/
		@JvmOverloads
		fun registerReceiver(
		BroadcastReceiver,
		IntentFilter,
		Executor? = context.mainExecutor,
		UserHandle = context.user
		) {
		open fun registerReceiver(
		receiver: BroadcastReceiver,
		filter: IntentFilter,
		executor: Executor? = null,
		user: UserHandle? = null
		)
		```

		All subscriptions are done with the same overloaded method. As specified in the doc, in order to pass a `UserHandle` with the default `Executor`, pass `null` for the `Executor`.

+9 −5

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ open class BroadcastDispatcher constructor (
		* @param executor An executor to dispatch [BroadcastReceiver.onReceive]. Pass null to use an
		* executor in the main thread (default).
		* @param user A user handle to determine which broadcast should be dispatched to this receiver.
		* By default, it is the user of the context (system user in SystemUI).
		* Pass `null` to use the user of the context (system user in SystemUI).
		* @throws IllegalArgumentException if the filter has other constraints that are not actions or
		* categories or the filter has no actions.
		*/
		@@ -120,13 +120,17 @@ open class BroadcastDispatcher constructor (
		open fun registerReceiver(
		receiver: BroadcastReceiver,
		filter: IntentFilter,
		executor: Executor? = context.mainExecutor,
		user: UserHandle = context.user
		executor: Executor? = null,
		user: UserHandle? = null
		) {
		checkFilter(filter)
		this.handler
		.obtainMessage(MSG_ADD_RECEIVER,
		ReceiverData(receiver, filter, executor ?: context.mainExecutor, user))
		.obtainMessage(MSG_ADD_RECEIVER, ReceiverData(
		receiver,
		filter,
		executor ?: context.mainExecutor,
		user ?: context.user
		))
		.sendToTarget()
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ class FakeBroadcastDispatcher(
		receiver: BroadcastReceiver,
		filter: IntentFilter,
		executor: Executor?,
		user: UserHandle
		user: UserHandle?
		) {
		registeredReceivers.add(receiver)
		}