Merge "Add excludedPackages parameter to broadcast" (5e3f53eb) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -4617,8 +4617,8 @@ public class ActivityManager {
		try {
		getService().broadcastIntentWithFeature(
		null, null, intent, null, null, Activity.RESULT_OK, null, null,
		null /requiredPermissions/, null /excludedPermissions/, appOp, null, false,
		true, userId);
		null /requiredPermissions/, null /excludedPermissions/,
		null /excludedPackages/, appOp, null, false, true, userId);
		} catch (RemoteException ex) {
		}
		}

core/java/android/app/ContextImpl.java

+24 −23

Original line number	Diff line number	Diff line
		@@ -1193,7 +1193,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, null, null /excludedPermissions=/,
		AppOpsManager.OP_NONE, null, false, false, getUserId());
		null, AppOpsManager.OP_NONE, null, false, false, getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1210,7 +1210,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, receiverPermissions,
		null /excludedPermissions=/, AppOpsManager.OP_NONE, null, false, false,
		null /excludedPermissions=/, null, AppOpsManager.OP_NONE, null, false, false,
		getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		@@ -1226,7 +1226,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, receiverPermissions,
		null /excludedPermissions=/, AppOpsManager.OP_NONE, null, false, false,
		null /excludedPermissions=/, null, AppOpsManager.OP_NONE, null, false, false,
		getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		@@ -1243,8 +1243,8 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, receiverPermissions,
		null /excludedPermissions=/, AppOpsManager.OP_NONE, options, false, false,
		getUserId());
		null /excludedPermissions=/, null /excludedPackages/,
		AppOpsManager.OP_NONE, options, false, false, getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1259,7 +1259,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, receiverPermissions,
		null /excludedPermissions=/, AppOpsManager.OP_NONE, null, false, false,
		null /excludedPermissions=/, null, AppOpsManager.OP_NONE, null, false, false,
		user.getIdentifier());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		@@ -1268,7 +1268,7 @@ class ContextImpl extends Context {

		@Override
		public void sendBroadcastMultiplePermissions(Intent intent, String[] receiverPermissions,
		String[] excludedPermissions) {
		String[] excludedPermissions, String[] excludedPackages) {
		warnIfCallingFromSystemProcess();
		String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
		try {
		@@ -1276,7 +1276,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, receiverPermissions, excludedPermissions,
		AppOpsManager.OP_NONE, null, false, false, getUserId());
		excludedPackages, AppOpsManager.OP_NONE, null, false, false, getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1303,7 +1303,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, receiverPermissions,
		excludedPermissions, AppOpsManager.OP_NONE, options, false, false,
		excludedPermissions, null, AppOpsManager.OP_NONE, options, false, false,
		getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		@@ -1321,7 +1321,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, receiverPermissions,
		null /excludedPermissions=/, appOp, null, false, false, getUserId());
		null /excludedPermissions=/, null, appOp, null, false, false, getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1338,7 +1338,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, receiverPermissions,
		null /excludedPermissions=/, AppOpsManager.OP_NONE, null, true, false,
		null /excludedPermissions=/, null, AppOpsManager.OP_NONE, null, true, false,
		getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		@@ -1402,7 +1402,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		rd, initialCode, initialData, initialExtras, receiverPermissions,
		null /excludedPermissions=/, appOp, options, true, false, getUserId());
		null /excludedPermissions=/, null, appOp, options, true, false, getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1416,7 +1416,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, null, null /excludedPermissions=/,
		AppOpsManager.OP_NONE, null, false, false, user.getIdentifier());
		null, AppOpsManager.OP_NONE, null, false, false, user.getIdentifier());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1439,8 +1439,8 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, receiverPermissions,
		null /excludedPermissions=/, AppOpsManager.OP_NONE, options, false, false,
		user.getIdentifier());
		null /excludedPermissions=/, null, AppOpsManager.OP_NONE, options, false,
		false, user.getIdentifier());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1457,7 +1457,8 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, receiverPermissions,
		null /excludedPermissions=/, appOp, null, false, false, user.getIdentifier());
		null /excludedPermissions=/, null, appOp, null, false, false,
		user.getIdentifier());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1508,7 +1509,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		rd, initialCode, initialData, initialExtras, receiverPermissions,
		null /excludedPermissions=/, appOp, options, true, false,
		null /excludedPermissions=/, null, appOp, options, true, false,
		user.getIdentifier());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		@@ -1550,7 +1551,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, null, null /excludedPermissions=/,
		AppOpsManager.OP_NONE, null, false, true, getUserId());
		null, AppOpsManager.OP_NONE, null, false, true, getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1589,7 +1590,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, null, null /excludedPermissions=/,
		AppOpsManager.OP_NONE, options, false, true, getUserId());
		null, AppOpsManager.OP_NONE, options, false, true, getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1625,7 +1626,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		rd, initialCode, initialData, initialExtras, null,
		null /excludedPermissions=/, AppOpsManager.OP_NONE, null, true, true,
		null /excludedPermissions=/, null, AppOpsManager.OP_NONE, null, true, true,
		getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		@@ -1658,7 +1659,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, null, null /excludedPermissions=/,
		AppOpsManager.OP_NONE, null, false, true, user.getIdentifier());
		null, AppOpsManager.OP_NONE, null, false, true, user.getIdentifier());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1673,7 +1674,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		null, Activity.RESULT_OK, null, null, null, null /excludedPermissions=/,
		AppOpsManager.OP_NONE, options, false, true, user.getIdentifier());
		null, AppOpsManager.OP_NONE, options, false, true, user.getIdentifier());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -1708,7 +1709,7 @@ class ContextImpl extends Context {
		ActivityManager.getService().broadcastIntentWithFeature(
		mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,
		rd, initialCode, initialData, initialExtras, null,
		null /excludedPermissions=/, AppOpsManager.OP_NONE, null, true, true,
		null /excludedPermissions=/, null, AppOpsManager.OP_NONE, null, true, true,
		user.getIdentifier());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();

core/java/android/app/IActivityManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ interface IActivityManager {
		int broadcastIntentWithFeature(in IApplicationThread caller, in String callingFeatureId,
		in Intent intent, in String resolvedType, in IIntentReceiver resultTo, int resultCode,
		in String resultData, in Bundle map, in String[] requiredPermissions, in String[] excludePermissions,
		int appOp, in Bundle options, boolean serialized, boolean sticky, int userId);
		in String[] excludePackages, int appOp, in Bundle options, boolean serialized, boolean sticky, int userId);
		void unbroadcastIntent(in IApplicationThread caller, in Intent intent, int userId);
		@UnsupportedAppUsage
		oneway void finishReceiver(in IBinder who, int resultCode, in String resultData, in Bundle map,

core/java/android/content/Context.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -2269,6 +2269,19 @@ public abstract class Context {
		*/
		public void sendBroadcastMultiplePermissions(@NonNull Intent intent,
		@NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions) {
		sendBroadcastMultiplePermissions(intent, receiverPermissions, excludedPermissions, null);
		}


		/**
		* Like {@link #sendBroadcastMultiplePermissions(Intent, String[], String[])}, but also allows
		* specification of a list of excluded packages.
		*
		* @hide
		*/
		public void sendBroadcastMultiplePermissions(@NonNull Intent intent,
		@NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions,
		@Nullable String[] excludedPackages) {
		throw new RuntimeException("Not implemented. Must override in a subclass.");
		}

core/java/android/content/ContextWrapper.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -515,8 +515,10 @@ public class ContextWrapper extends Context {
		/** @hide */
		@Override
		public void sendBroadcastMultiplePermissions(@NonNull Intent intent,
		@NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions) {
		mBase.sendBroadcastMultiplePermissions(intent, receiverPermissions, excludedPermissions);
		@NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions,
		@Nullable String[] excludedPackages) {
		mBase.sendBroadcastMultiplePermissions(intent, receiverPermissions, excludedPermissions,
		excludedPackages);
		}

		/** @hide */