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

Commit a5f89b13 authored by Joe Onorato's avatar Joe Onorato Committed by android-build-merger
Browse files

Merge changes I036fbc5f,I979f0107 into nyc-dev 

am: 60b68887

* commit '60b68887':
  If we can't call into an app process to deliver an intent, crash the process.
  If a crash dialog can't be shown, just kill the process.

Change-Id: I6691a982e84fefbd537010417e3fee2580cbd1b9
parents 9e1e02dc 60b68887

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

+1 −13
Original line number Diff line number Diff line
@@ -293,19 +293,7 @@ class AppErrors { 
            return;

        }



        if (proc.thread != null) {

            if (proc.pid == Process.myPid()) {

                Log.w(TAG, "crashApplication: trying to crash self!");

                return;

            }

            long ident = Binder.clearCallingIdentity();

            try {

                proc.thread.scheduleCrash(message);

            } catch (RemoteException e) {

            } finally {

                Binder.restoreCallingIdentity(ident);

            }

        }

        proc.scheduleCrash(message);

    }



    /**

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);



                        }

                    }

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

+25 −0
Original line number Diff line number Diff line
@@ -37,9 +37,11 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.res.CompatibilityInfo;

import android.os.Binder;

import android.os.Bundle;

import android.os.IBinder;

import android.os.Process;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.Trace;

import android.os.UserHandle;
@@ -552,6 +554,29 @@ final class ProcessRecord { 
        return adj;

    }



    void scheduleCrash(String message) {

        // Checking killedbyAm should keep it from showing the crash dialog if the process

        // was already dead for a good / normal reason.

        if (!killedByAm) {

            if (thread != null) {

                if (pid == Process.myPid()) {

                    Slog.w(TAG, "scheduleCrash: trying to crash system process!");

                    return;

                }

                long ident = Binder.clearCallingIdentity();

                try {

                    thread.scheduleCrash(message);

                } catch (RemoteException e) {

                    // If it's already dead our work is done. If it's wedged just kill it.

                    // We won't get the crash dialog or the error reporting.

                    kill("scheduleCrash for '" + message + "' failed", true);

                } finally {

                    Binder.restoreCallingIdentity(ident);

                }

            }

        }

    }



    void kill(String reason, boolean noisy) {

        if (!killedByAm) {

            Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "kill");