Merge "Expose Context.sendOrderedBroadcast with appop" (08a94a22) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -9769,6 +9769,7 @@ package android.content {
		method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String);
		method public abstract void sendOrderedBroadcast(@RequiresPermission android.content.Intent, @Nullable String);
		method public abstract void sendOrderedBroadcast(@NonNull @RequiresPermission android.content.Intent, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
		method public void sendOrderedBroadcast(@NonNull @RequiresPermission android.content.Intent, @Nullable String, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
		method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public abstract void sendOrderedBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
		method @Deprecated @RequiresPermission(android.Manifest.permission.BROADCAST_STICKY) public abstract void sendStickyBroadcast(@RequiresPermission android.content.Intent);
		method @Deprecated @RequiresPermission(allOf={"android.permission.INTERACT_ACROSS_USERS", android.Manifest.permission.BROADCAST_STICKY}) public abstract void sendStickyBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle);

core/java/android/app/ContextImpl.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ import android.system.ErrnoException;
		import android.system.Os;
		import android.system.OsConstants;
		import android.system.StructStat;
		import android.text.TextUtils;
		import android.util.AndroidRuntimeException;
		import android.util.ArrayMap;
		import android.util.Log;
		@@ -1329,6 +1330,19 @@ class ContextImpl extends Context {
		}
		}

		@Override
		public void sendOrderedBroadcast(Intent intent, String receiverPermission,
		String receiverAppOp, BroadcastReceiver resultReceiver, Handler scheduler,
		int initialCode, String initialData, @Nullable Bundle initialExtras) {
		int intAppOp = AppOpsManager.OP_NONE;
		if (!TextUtils.isEmpty(receiverAppOp)) {
		intAppOp = AppOpsManager.strOpToOp(receiverAppOp);
		}
		sendOrderedBroadcastAsUser(intent, getUser(),
		receiverPermission, intAppOp, resultReceiver, scheduler, initialCode, initialData,
		initialExtras);
		}

		@Override
		@Deprecated
		public void sendStickyBroadcast(Intent intent) {

core/java/android/content/Context.java

+38 −0

Original line number	Diff line number	Diff line
		@@ -2392,6 +2392,44 @@ public abstract class Context {
		BroadcastReceiver resultReceiver, @Nullable Handler scheduler, int initialCode,
		@Nullable String initialData, @Nullable Bundle initialExtras);

		/**
		* Version of
		* {@link #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String,
		* Bundle)} that allows you to specify the App Op to enforce restrictions on which receivers
		* the broadcast will be sent to.
		*
		* <p>See {@link BroadcastReceiver} for more information on Intent broadcasts.
		*
		* @param intent The Intent to broadcast; all receivers matching this
		* Intent will receive the broadcast.
		* @param receiverPermission String naming a permissions that
		* a receiver must hold in order to receive your broadcast.
		* If null, no permission is required.
		* @param receiverAppOp The app op associated with the broadcast. If null, no appOp is
		* required. If both receiverAppOp and receiverPermission are non-null,
		* a receiver must have both of them to
		* receive the broadcast
		* @param resultReceiver Your own BroadcastReceiver to treat as the final
		* receiver of the broadcast.
		* @param scheduler A custom Handler with which to schedule the
		* resultReceiver callback; if null it will be
		* scheduled in the Context's main thread.
		* @param initialCode An initial value for the result code. Often
		* Activity.RESULT_OK.
		* @param initialData An initial value for the result data. Often
		* null.
		* @param initialExtras An initial value for the result extras. Often
		* null.
		*
		* @see #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle)
		*/
		public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent,
		@Nullable String receiverPermission, @Nullable String receiverAppOp,
		@Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,
		int initialCode, @Nullable String initialData, @Nullable Bundle initialExtras) {
		throw new RuntimeException("Not implemented. Must override in a subclass.");
		}

		/**
		* <p>Perform a {@link #sendBroadcast(Intent)} that is "sticky," meaning the
		* Intent you are sending stays around after the broadcast is complete,

core/java/android/content/ContextWrapper.java

+27 −14

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		package android.content;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.annotation.UnsupportedAppUsage;
		@@ -499,7 +502,8 @@ public class ContextWrapper extends Context {
		@SystemApi
		@Override
		public void sendOrderedBroadcast(
		Intent intent, String receiverPermission, Bundle options, BroadcastReceiver resultReceiver,
		Intent intent, String receiverPermission, Bundle options,
		BroadcastReceiver resultReceiver,
		Handler scheduler, int initialCode, String initialData,
		Bundle initialExtras) {
		mBase.sendOrderedBroadcast(intent, receiverPermission,
		@@ -569,6 +573,15 @@ public class ContextWrapper extends Context {
		resultReceiver, scheduler, initialCode, initialData, initialExtras);
		}

		@Override
		public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent,
		@Nullable String receiverPermission, @Nullable String receiverAppOp,
		@Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,
		int initialCode, @Nullable String initialData, @Nullable Bundle initialExtras) {
		mBase.sendOrderedBroadcast(intent, receiverPermission, receiverAppOp, resultReceiver,
		scheduler, initialCode, initialData, initialExtras);
		}

		@Override
		@Deprecated
		public void sendStickyBroadcast(Intent intent) {

test-mock/src/android/test/mock/MockContext.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -462,6 +462,13 @@ public class MockContext extends Context {
		throw new UnsupportedOperationException();
		}

		@Override
		public void sendOrderedBroadcast(Intent intent, String receiverPermission,
		String receiverAppOp, BroadcastReceiver resultReceiver, Handler scheduler,
		int initialCode, String initialData, Bundle initialExtras) {
		throw new UnsupportedOperationException();
		}

		@Override
		public void sendStickyBroadcast(Intent intent) {
		throw new UnsupportedOperationException();