Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev (4a817924) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerNative.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -456,14 +456,14 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		int resultCode = data.readInt();
		String resultData = data.readString();
		Bundle resultExtras = data.readBundle();
		String[] perms = data.readStringArray();
		String perm = data.readString();
		int appOp = data.readInt();
		Bundle options = data.readBundle();
		boolean serialized = data.readInt() != 0;
		boolean sticky = data.readInt() != 0;
		int userId = data.readInt();
		int res = broadcastIntent(app, intent, resolvedType, resultTo,
		resultCode, resultData, resultExtras, perms, appOp,
		resultCode, resultData, resultExtras, perm, appOp,
		options, serialized, sticky, userId);
		reply.writeNoException();
		reply.writeInt(res);
		@@ -3007,7 +3007,7 @@ class ActivityManagerProxy implements IActivityManager
		public int broadcastIntent(IApplicationThread caller,
		Intent intent, String resolvedType, IIntentReceiver resultTo,
		int resultCode, String resultData, Bundle map,
		String[] requiredPermissions, int appOp, Bundle options, boolean serialized,
		String requiredPermission, int appOp, Bundle options, boolean serialized,
		boolean sticky, int userId) throws RemoteException
		{
		Parcel data = Parcel.obtain();
		@@ -3020,7 +3020,7 @@ class ActivityManagerProxy implements IActivityManager
		data.writeInt(resultCode);
		data.writeString(resultData);
		data.writeBundle(map);
		data.writeStringArray(requiredPermissions);
		data.writeString(requiredPermission);
		data.writeInt(appOp);
		data.writeBundle(options);
		data.writeInt(serialized ? 1 : 0);

core/java/android/app/ContextImpl.java

+10 −39

Original line number	Diff line number	Diff line
		@@ -180,7 +180,7 @@ class ContextImpl extends Context {
		@GuardedBy("mSync")
		private File[] mExternalMediaDirs;

		private static final String[] EMPTY_STRING_ARRAY = {};
		private static final String[] EMPTY_FILE_LIST = {};

		// The system service cache for the system services that are cached per-ContextImpl.
		final Object[] mServiceCache = SystemServiceRegistry.createServiceCache();
		@@ -552,7 +552,7 @@ class ContextImpl extends Context {
		@Override
		public String[] fileList() {
		final String[] list = getFilesDir().list();
		return (list != null) ? list : EMPTY_STRING_ARRAY;
		return (list != null) ? list : EMPTY_FILE_LIST;
		}

		@Override
		@@ -591,7 +591,7 @@ class ContextImpl extends Context {
		@Override
		public String[] databaseList() {
		final String[] list = getDatabasesDir().list();
		return (list != null) ? list : EMPTY_STRING_ARRAY;
		return (list != null) ? list : EMPTY_FILE_LIST;
		}


		@@ -777,28 +777,11 @@ class ContextImpl extends Context {
		public void sendBroadcast(Intent intent, String receiverPermission) {
		warnIfCallingFromSystemProcess();
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		String[] receiverPermissions = receiverPermission == null ? null
		: new String[] {receiverPermission};
		try {
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,
		null, false, false, getUserId());
		} catch (RemoteException e) {
		throw new RuntimeException("Failure from system", e);
		}
		}

		@Override
		public void sendBroadcast(Intent intent, String[] receiverPermissions) {
		warnIfCallingFromSystemProcess();
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,
		Activity.RESULT_OK, null, null, receiverPermission, AppOpsManager.OP_NONE,
		null, false, false, getUserId());
		} catch (RemoteException e) {
		throw new RuntimeException("Failure from system", e);
		@@ -809,13 +792,11 @@ class ContextImpl extends Context {
		public void sendBroadcast(Intent intent, String receiverPermission, Bundle options) {
		warnIfCallingFromSystemProcess();
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		String[] receiverPermissions = receiverPermission == null ? null
		: new String[] {receiverPermission};
		try {
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,
		Activity.RESULT_OK, null, null, receiverPermission, AppOpsManager.OP_NONE,
		options, false, false, getUserId());
		} catch (RemoteException e) {
		throw new RuntimeException("Failure from system", e);
		@@ -826,13 +807,11 @@ class ContextImpl extends Context {
		public void sendBroadcast(Intent intent, String receiverPermission, int appOp) {
		warnIfCallingFromSystemProcess();
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		String[] receiverPermissions = receiverPermission == null ? null
		: new String[] {receiverPermission};
		try {
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, receiverPermissions, appOp, null, false, false,
		Activity.RESULT_OK, null, null, receiverPermission, appOp, null, false, false,
		getUserId());
		} catch (RemoteException e) {
		throw new RuntimeException("Failure from system", e);
		@@ -843,13 +822,11 @@ class ContextImpl extends Context {
		public void sendOrderedBroadcast(Intent intent, String receiverPermission) {
		warnIfCallingFromSystemProcess();
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		String[] receiverPermissions = receiverPermission == null ? null
		: new String[] {receiverPermission};
		try {
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,
		Activity.RESULT_OK, null, null, receiverPermission, AppOpsManager.OP_NONE,
		null, true, false, getUserId());
		} catch (RemoteException e) {
		throw new RuntimeException("Failure from system", e);
		@@ -906,13 +883,11 @@ class ContextImpl extends Context {
		}
		}
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		String[] receiverPermissions = receiverPermission == null ? null
		: new String[] {receiverPermission};
		try {
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, rd,
		initialCode, initialData, initialExtras, receiverPermissions, appOp,
		initialCode, initialData, initialExtras, receiverPermission, appOp,
		options, true, false, getUserId());
		} catch (RemoteException e) {
		throw new RuntimeException("Failure from system", e);
		@@ -942,13 +917,11 @@ class ContextImpl extends Context {
		public void sendBroadcastAsUser(Intent intent, UserHandle user,
		String receiverPermission, int appOp) {
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		String[] receiverPermissions = receiverPermission == null ? null
		: new String[] {receiverPermission};
		try {
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, null,
		Activity.RESULT_OK, null, null, receiverPermissions, appOp, null, false, false,
		Activity.RESULT_OK, null, null, receiverPermission, appOp, null, false, false,
		user.getIdentifier());
		} catch (RemoteException e) {
		throw new RuntimeException("Failure from system", e);
		@@ -986,13 +959,11 @@ class ContextImpl extends Context {
		}
		}
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		String[] receiverPermissions = receiverPermission == null ? null
		: new String[] {receiverPermission};
		try {
		intent.prepareToLeaveProcess();
		ActivityManagerNative.getDefault().broadcastIntent(
		mMainThread.getApplicationThread(), intent, resolvedType, rd,
		initialCode, initialData, initialExtras, receiverPermissions,
		initialCode, initialData, initialExtras, receiverPermission,
		appOp, null, true, false, user.getIdentifier());
		} catch (RemoteException e) {
		throw new RuntimeException("Failure from system", e);

core/java/android/app/IActivityManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ public interface IActivityManager extends IInterface {
		public void unregisterReceiver(IIntentReceiver receiver) throws RemoteException;
		public int broadcastIntent(IApplicationThread caller, Intent intent,
		String resolvedType, IIntentReceiver resultTo, int resultCode,
		String resultData, Bundle map, String[] requiredPermissions,
		String resultData, Bundle map, String requiredPermission,
		int appOp, Bundle options, boolean serialized, boolean sticky, int userId) throws RemoteException;
		public void unbroadcastIntent(IApplicationThread caller, Intent intent, int userId) throws RemoteException;
		public void finishReceiver(IBinder who, int resultCode, String resultData, Bundle map,

core/java/android/content/Context.java

+0 −26

Original line number	Diff line number	Diff line
		@@ -1516,32 +1516,6 @@ public abstract class Context {
		public abstract void sendBroadcast(Intent intent,
		@Nullable String receiverPermission);


		/**
		* Broadcast the given intent to all interested BroadcastReceivers, allowing
		* an array of required permissions to be enforced. This call is asynchronous; it returns
		* immediately, and you will continue executing while the receivers are run. No results are
		* propagated from receivers and receivers can not abort the broadcast. If you want to allow
		* receivers to propagate results or abort the broadcast, you must send an ordered broadcast
		* using {@link #sendOrderedBroadcast(Intent, String)}.
		*
		* <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 receiverPermissions Array of names of permissions that a receiver must hold
		* in order to receive your broadcast.
		* If null or empty, no permissions are required.
		*
		* @see android.content.BroadcastReceiver
		* @see #registerReceiver
		* @see #sendBroadcast(Intent)
		* @see #sendOrderedBroadcast(Intent, String)
		* @see #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle)
		* @hide
		*/
		public abstract void sendBroadcast(Intent intent, String[] receiverPermissions);

		/**
		* Broadcast the given intent to all interested BroadcastReceivers, allowing
		* an optional required permission to be enforced. This

core/java/android/content/ContextWrapper.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -401,12 +401,6 @@ public class ContextWrapper extends Context {
		mBase.sendBroadcast(intent, receiverPermission);
		}

		/** @hide */
		@Override
		public void sendBroadcast(Intent intent, String[] receiverPermissions) {
		mBase.sendBroadcast(intent, receiverPermissions);
		}

		/** @hide */
		@SystemApi
		@Override