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

Commit 532f7328 authored by Craig Mautner's avatar Craig Mautner
Browse files

resolved conflicts for merge of 5c4b5ede to lmp-dev-plus-aosp 

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

Change-Id: Id6ece6daa4a36dc8479f5bce867cce3b42b3ef70
parents 689e2752 5c4b5ede

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

+11 −5
Original line number Diff line number Diff line
@@ -10966,12 +10966,18 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    int uid = r != null ? r.info.uid : Binder.getCallingUid();

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

                            if (r != null) {

                                Process.killProcessGroup(uid, pid);

                            }

                        }

                        return;

                    }

                } catch (RemoteException e) {