Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5869d1c5 authored by Joe Onorato's avatar Joe Onorato
Browse files

If we can't call into an app process to deliver an intent, crash the process. 

Rather than hoping the process will crash for some other reason, it is
better to just get rid of it right away. The Intent was not delivered,
so there are no guarantees that the app will continue to function
correctly.

Bug: 28196243
Change-Id: I036fbc5ffd42dc7259437cc5a733976478a2dd3a
parent 57190287

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

+20 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.ResolveInfo;

import android.os.Build;

import android.os.Bundle;

import android.os.DeadObjectException;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;
@@ -446,7 +447,7 @@ public final class BroadcastQueue { 
        }

    }



    private static void performReceiveLocked(ProcessRecord app, IIntentReceiver receiver,

    private void performReceiveLocked(ProcessRecord app, IIntentReceiver receiver,

            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.
@@ -454,8 +455,23 @@ public final class BroadcastQueue { 
            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.

                try {

                    app.thread.scheduleRegisteredReceiver(receiver, intent, resultCode,

                            data, extras, ordered, sticky, sendingUser, app.repProcState);

                // TODO: Uncomment this when (b/28322359) is fixed and we aren't getting

                // DeadObjectException when the process isn't actually dead.

                //} catch (DeadObjectException ex) {

                // Failed to call into the process.  It's dying so just let it die and move on.

                //    throw ex;

                } catch (RemoteException ex) {

                    // Failed to call into the process. It's either dying or wedged. Kill it gently.

                    synchronized (mService) {

                        Slog.w(TAG, "Can't deliver broadcast to " + app.processName

                                + " (pid " + app.pid + "). Crashing it.");

                        app.scheduleCrash("can't deliver broadcast");

                    }

                    throw ex;

                }

            } else {

                // Application has died. Receiver doesn't exist.

                throw new RemoteException("app.thread must not be null");
@@ -853,6 +869,7 @@ public final class BroadcastQueue { 
                            Slog.w(TAG, "Failure ["

                                    + mQueueName + "] sending broadcast result of "

                                    + r.intent, e);



                        }

                    }