Merge "[API Review] Expose sendOrderedBroadcast" am: 5e153e49a0 (d8b60001) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/InboundSmsHandler.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -1178,20 +1178,20 @@ public abstract class InboundSmsHandler extends StateMachine {
		// Only pass in the resultReceiver when the user SYSTEM is processed.
		try {
		mContext.createPackageContextAsUser(mContext.getPackageName(), 0, targetUser)
		.sendOrderedBroadcast(intent, permission, appOp, opts,
		.sendOrderedBroadcast(intent, Activity.RESULT_OK, permission, appOp,
		users[i] == UserHandle.SYSTEM.getIdentifier()
		? resultReceiver : null,
		getHandler(), Activity.RESULT_OK, null /* initialData */,
		null /* initialExtras */);
		getHandler(), null /* initialData */,
		null /* initialExtras */, opts);
		} catch (PackageManager.NameNotFoundException ignored) {
		}
		}
		} else {
		try {
		mContext.createPackageContextAsUser(mContext.getPackageName(), 0, user)
		.sendOrderedBroadcast(intent, permission, appOp, opts, resultReceiver,
		getHandler(), Activity.RESULT_OK, null /* initialData */,
		null /* initialExtras */);
		.sendOrderedBroadcast(intent, Activity.RESULT_OK, permission, appOp,
		resultReceiver, getHandler(), null /* initialData */,
		null /* initialExtras */, opts);
		} catch (PackageManager.NameNotFoundException ignored) {
		}
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -459,9 +459,9 @@ public class ContextFixture implements TestFixture<Context> {
		}

		@Override
		public void sendOrderedBroadcast(Intent intent, String receiverPermission,
		String receiverAppOp, Bundle options, BroadcastReceiver resultReceiver,
		Handler scheduler, int initialCode, String initialData, Bundle initialExtras) {
		public void sendOrderedBroadcast(Intent intent, int initialCode, String receiverPermission,
		String receiverAppOp, BroadcastReceiver resultReceiver, Handler scheduler,
		String initialData, Bundle initialExtras, Bundle options) {
		logd("sendOrderedBroadcast called for " + intent.getAction());
		mLastBroadcastOptions = options;
		sendBroadcast(intent);