Merge "Skip broadcasting to a receiver if the receiver seems to be dead" (02fd104f) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/BroadcastQueue.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -415,11 +415,16 @@ public final class BroadcastQueue {
		Intent intent, int resultCode, String data, Bundle extras,
		boolean ordered, boolean sticky, int sendingUser) throws RemoteException {
		// Send the intent to the receiver asynchronously using one-way binder calls.
		if (app != null && app.thread != null) {
		if (app != null) {
		if (app.thread != null) {
		// If we have an app thread, do the call through that so it is
		// correctly ordered with other one-way calls.
		app.thread.scheduleRegisteredReceiver(receiver, intent, resultCode,
		data, extras, ordered, sticky, sendingUser, app.repProcState);
		} else {
		// Application has died. Receiver doesn't exist.
		throw new RemoteException("app.thread must not be null");
		}
		} else {
		receiver.performReceive(intent, resultCode, data, extras, ordered,
		sticky, sendingUser);
		@@ -661,6 +666,7 @@ public final class BroadcastQueue {
		// (local and remote) isn't kept in the mBroadcastHistory.
		r.resultTo = null;
		} catch (RemoteException e) {
		r.resultTo = null;
		Slog.w(TAG, "Failure ["
		+ mQueueName + "] sending broadcast result of "
		+ r.intent, e);