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

Commit 5c4b5ede authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 6a58309e: Merge "[ActivityManager] Prevent coredump file may not complete for testing." 

* commit '6a58309e':
  [ActivityManager] Prevent coredump file may not complete for testing.
parents f37034ac 6a58309e

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

100755 → 100644
+9 −3
Original line number Diff line number Diff line
@@ -10083,9 +10083,15 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    int pid = r != null ? r.pid : Binder.getCallingPid();

                    if (!mController.appCrashed(name, pid,

                            shortMsg, longMsg, timeMillis, crashInfo.stackTrace)) {

                        if ("1".equals(SystemProperties.get(SYSTEM_DEBUGGABLE, "0"))

                                && "Native crash".equals(crashInfo.exceptionClassName)) {

                            Slog.w(TAG, "Skip killing native crashed app " + name

                                    + "(" + pid + ") during testing");

                        } else {

                            Slog.w(TAG, "Force-killing crashed app " + name

                                    + " at watcher's request");

                            Process.killProcess(pid);

                        }

                        return;

                    }

                } catch (RemoteException e) {