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

Commit 98a0092e authored by Amith Yamasani's avatar Amith Yamasani
Browse files

ProcessList refactor 

Moving code from ActivityManagerService to ProcessList for things
related to processes.

Only moving code now, will fix "deep links" in follow-up CLs.

Phase 1:
  Move process creation/removal code
  Move LRU structures

Next: Move oom_adj code

Bug: 111369273
Test: atest CtsAppTestCases
Change-Id: Icd369c3533b01ee8d40359ce6fe81c37df608c9a
parent 7a1b30e9

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

+1 −1
Original line number Diff line number Diff line
@@ -3620,7 +3620,7 @@ public final class ActiveServices { 
                    nextTime = sr.executingStart;

                }

            }

            if (timeout != null && mAm.mLruProcesses.contains(proc)) {

            if (timeout != null && mAm.mProcessList.mLruProcesses.contains(proc)) {

                Slog.w(TAG, "Timeout executing service: " + timeout);

                StringWriter sw = new StringWriter();

                PrintWriter pw = new FastPrintWriter(sw, false, 1024);

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

+184 −1662

File changed.

Preview size limit exceeded, changes collapsed.

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

+8 −8
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ class AppErrors { 
                proto.write(AppErrorsProto.ProcessCrashTime.PROCESS_NAME, pname);

                for (int i = 0; i < uidCount; i++) {

                    final int puid = uids.keyAt(i);

                    final ProcessRecord r = mService.mProcessNames.get(pname, puid);

                    final ProcessRecord r = mService.getProcessNames().get(pname, puid);

                    if (dumpPackage != null && (r == null || !r.pkgList.containsKey(dumpPackage))) {

                        continue;

                    }
@@ -148,7 +148,7 @@ class AppErrors { 
                proto.write(AppErrorsProto.BadProcess.PROCESS_NAME, pname);

                for (int i = 0; i < uidCount; i++) {

                    final int puid = uids.keyAt(i);

                    final ProcessRecord r = mService.mProcessNames.get(pname, puid);

                    final ProcessRecord r = mService.getProcessNames().get(pname, puid);

                    if (dumpPackage != null && (r == null

                            || !r.pkgList.containsKey(dumpPackage))) {

                        continue;
@@ -181,7 +181,7 @@ class AppErrors { 
                final int uidCount = uids.size();

                for (int i = 0; i < uidCount; i++) {

                    final int puid = uids.keyAt(i);

                    final ProcessRecord r = mService.mProcessNames.get(pname, puid);

                    final ProcessRecord r = mService.getProcessNames().get(pname, puid);

                    if (dumpPackage != null && (r == null

                            || !r.pkgList.containsKey(dumpPackage))) {

                        continue;
@@ -211,7 +211,7 @@ class AppErrors { 
                final int uidCount = uids.size();

                for (int i = 0; i < uidCount; i++) {

                    final int puid = uids.keyAt(i);

                    final ProcessRecord r = mService.mProcessNames.get(pname, puid);

                    final ProcessRecord r = mService.getProcessNames().get(pname, puid);

                    if (dumpPackage != null && (r == null

                            || !r.pkgList.containsKey(dumpPackage))) {

                        continue;
@@ -471,7 +471,7 @@ class AppErrors { 
                stopReportingCrashesLocked(r);

            }

            if (res == AppErrorDialog.RESTART) {

                mService.removeProcessLocked(r, false, true, "crash");

                mService.mProcessList.removeProcessLocked(r, false, true, "crash");

                if (taskId != INVALID_TASK_ID) {

                    try {

                        mService.mActivityTaskManager.startActivityFromRecents(taskId,
@@ -489,7 +489,7 @@ class AppErrors { 
                    // Kill it with fire!

                    mService.mAtmInternal.onHandleAppCrash(r.getWindowProcessController());

                    if (!r.isPersistent()) {

                        mService.removeProcessLocked(r, false, false, "crash");

                        mService.mProcessList.removeProcessLocked(r, false, false, "crash");

                        mService.mAtmInternal.resumeTopActivities(false /* scheduleIdle */);

                    }

                } finally {
@@ -551,7 +551,7 @@ class AppErrors { 
                    } else {

                        // Huh.

                        Process.killProcess(pid);

                        ActivityManagerService.killProcessGroup(uid, pid);

                        ProcessList.killProcessGroup(uid, pid);

                    }

                }

                return true;
@@ -714,7 +714,7 @@ class AppErrors { 
                // Don't let services in this process be restarted and potentially

                // annoy the user repeatedly.  Unless it is persistent, since those

                // processes run critical code.

                mService.removeProcessLocked(app, false, tryAgain, "crash");

                mService.mProcessList.removeProcessLocked(app, false, tryAgain, "crash");

                mService.mAtmInternal.resumeTopActivities(false /* scheduleIdle */);

                if (!showBackground) {

                    return false;

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

+2 −2
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ public final class BroadcastQueue { 
        r.curApp = app;

        app.curReceivers.add(r);

        app.forceProcessStateUpTo(ActivityManager.PROCESS_STATE_RECEIVER);

        mService.updateLruProcessLocked(app, false, null);

        mService.mProcessList.updateLruProcessLocked(app, false, null);

        if (!skipOomAdj) {

            mService.updateOomAdjLocked();

        }
@@ -892,7 +892,7 @@ public final class BroadcastQueue { 
                    isDead = proc == null || proc.isCrashing();

                }

            } else {

                final ProcessRecord proc = mService.mProcessNames.get(

                final ProcessRecord proc = mService.mProcessList.mProcessNames.get(

                        mPendingBroadcast.curApp.processName, mPendingBroadcast.curApp.uid);

                isDead = proc == null || !proc.pendingStart;

            }

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

+1739 −25

File changed.

Preview size limit exceeded, changes collapsed.