Merge "Don't get extras from the Intent" (14dc3c90) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+7 −8

Original line number	Diff line number	Diff line
		@@ -7057,7 +7057,6 @@ public final class ActivityManagerService extends ActivityManagerNative
		return;
		}

		final IPackageManager pm = AppGlobals.getPackageManager();
		final String authority = uri.getAuthority();
		final ProviderInfo pi = getProviderInfoLocked(authority, userId);
		if (pi == null) {
		@@ -15784,13 +15783,13 @@ public final class ActivityManagerService extends ActivityManagerNative
		callerPackage, callingPid, callingUid, resolvedType,
		requiredPermission, appOp, receivers, resultTo, resultCode,
		resultData, map, ordered, sticky, false, userId);

		if (DEBUG_BROADCAST) Slog.v(
		TAG, "Enqueueing ordered broadcast " + r
		+ ": prev had " + queue.mOrderedBroadcasts.size());
		if (DEBUG_BROADCAST) {
		int seq = r.intent.getIntExtra("seq", -1);
		Slog.i(TAG, "Enqueueing broadcast " + r.intent.getAction() + " seq=" + seq);
		}
		if (DEBUG_BROADCAST) Slog.i(
		TAG, "Enqueueing broadcast " + r.intent.getAction());

		boolean replaced = replacePending && queue.replaceOrderedBroadcastLocked(r);
		if (!replaced) {
		queue.enqueueOrderedBroadcastLocked(r);
		@@ -18352,8 +18351,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		}

		private Set getProfileIdsLocked(int userId) {
		Set userIds = new HashSet<Integer>();
		private Set<Integer> getProfileIdsLocked(int userId) {
		Set<Integer> userIds = new HashSet<Integer>();
		final List<UserInfo> profiles = getUserManagerLocked().getProfiles(
		userId, false /* enabledOnly */);
		for (UserInfo user : profiles) {

+4 −11

Original line number	Diff line number	Diff line
		@@ -513,11 +513,7 @@ public final class BroadcastQueue {
		}
		}
		try {
		if (DEBUG_BROADCAST_LIGHT) {
		int seq = r.intent.getIntExtra("seq", -1);
		Slog.i(TAG, "Delivering to " + filter
		+ " (seq=" + seq + "): " + r);
		}
		if (DEBUG_BROADCAST_LIGHT) Slog.i(TAG, "Delivering to " + filter + " : " + r);
		performReceiveLocked(filter.receiverList.app, filter.receiverList.receiver,
		new Intent(r.intent), r.resultCode, r.resultData,
		r.resultExtras, r.ordered, r.initialSticky, r.userId);
		@@ -662,12 +658,9 @@ public final class BroadcastQueue {
		// result if requested...
		if (r.resultTo != null) {
		try {
		if (DEBUG_BROADCAST) {
		int seq = r.intent.getIntExtra("seq", -1);
		Slog.i(TAG, "Finishing broadcast ["
		+ mQueueName + "] " + r.intent.getAction()
		+ " seq=" + seq + " app=" + r.callerApp);
		}
		if (DEBUG_BROADCAST) Slog.i(TAG,
		"Finishing broadcast [" + mQueueName + "] "
		+ r.intent.getAction() + " app=" + r.callerApp);
		performReceiveLocked(r.callerApp, r.resultTo,
		new Intent(r.intent), r.resultCode,
		r.resultData, r.resultExtras, false, false, r.userId);