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

Commit ddd30775 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Move logic for handling uid observers outside AMS."

parents 1c997e4e 70f4ae34

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

+21 −409

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ public final class OomAdjuster { 
                uidRec.setWhitelist = uidRec.curWhitelist;

                uidRec.setIdle = uidRec.idle;

                mService.mAtmInternal.onUidProcStateChanged(uidRec.uid, uidRec.setProcState);

                mService.enqueueUidChangeLocked(uidRec, -1, uidChange);

                mService.mUidObserverController.enqueueUidChangeLocked(uidRec, -1, uidChange);

                mService.noteUidProcessState(uidRec.uid, uidRec.getCurProcState(),

                        uidRec.curCapability);

                if (uidRec.foregroundServices) {

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

+2 −1
Original line number Diff line number Diff line
@@ -2960,7 +2960,8 @@ public final class ProcessList { 
                // No more processes using this uid, tell clients it is gone.

                if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,

                        "No more processes in " + uidRecord);

                mService.enqueueUidChangeLocked(uidRecord, -1, UidRecord.CHANGE_GONE);

                mService.mUidObserverController.enqueueUidChangeLocked(uidRecord, -1,

                        UidRecord.CHANGE_GONE);

                EventLogTags.writeAmUidStopped(uid);

                mActiveUids.remove(uid);

                mService.noteUidProcessState(uid, ActivityManager.PROCESS_STATE_NONEXISTENT,

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

0 → 100644
+460 −0

File added.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java

+30 −30

File changed.

Preview size limit exceeded, changes collapsed.