Merge "AMS: add API to IProcessInfoServive for retrieving oom scores" (e7f24e22) · Commits · e / os / android_frameworks_base

core/java/android/os/IProcessInfoService.aidl

+7 −0

Original line number	Diff line number	Diff line
		@@ -25,5 +25,12 @@ interface IProcessInfoService
		* to indicate that no process with the given PID exists.
		*/
		void getProcessStatesFromPids(in int[] pids, out int[] states);

		/**
		* For each PID in the given input array, write the current process state and OOM score
		* for that process into the output arrays, or ActivityManager.PROCESS_STATE_NONEXISTENT
		* in the states array to indicate that no process with the given PID exists.
		*/
		void getProcessStatesAndOomScoresFromPids(in int[] pids, out int[] states, out int[] scores);
		}

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

+21 −5

Original line number	Diff line number	Diff line
		@@ -7148,22 +7148,35 @@ public final class ActivityManagerService extends ActivityManagerNative

		@Override
		public void getProcessStatesFromPids(/in/ int[] pids, /out/ int[] states) {
		mActivityManagerService.getProcessStatesForPIDs(/in/ pids, /out/ states);
		mActivityManagerService.getProcessStatesAndOomScoresForPIDs(
		/in/ pids, /out/ states, null);
		}

		@Override
		public void getProcessStatesAndOomScoresFromPids(
		/in/ int[] pids, /out/ int[] states, /out/ int[] scores) {
		mActivityManagerService.getProcessStatesAndOomScoresForPIDs(
		/in/ pids, /out/ states, /out/ scores);
		}
		}

		/**
		* For each PID in the given input array, write the current process state
		* for that process into the output array, or -1 to indicate that no
		* process with the given PID exists.
		* for that process into the states array, or -1 to indicate that no
		* process with the given PID exists. If scores array is provided, write
		* the oom score for the process into the scores array, with INVALID_ADJ
		* indicating the PID doesn't exist.
		*/
		public void getProcessStatesForPIDs(/in/ int[] pids, /out/ int[] states) {
		public void getProcessStatesAndOomScoresForPIDs(
		/in/ int[] pids, /out/ int[] states, /out/ int[] scores) {
		if (pids == null) {
		throw new NullPointerException("pids");
		} else if (states == null) {
		throw new NullPointerException("states");
		} else if (pids.length != states.length) {
		throw new IllegalArgumentException("input and output arrays have different lengths!");
		throw new IllegalArgumentException("pids and states arrays have different lengths!");
		} else if (scores != null && pids.length != scores.length) {
		throw new IllegalArgumentException("pids and scores arrays have different lengths!");
		}

		synchronized (mPidsSelfLocked) {
		@@ -7171,6 +7184,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		ProcessRecord pr = mPidsSelfLocked.get(pids[i]);
		states[i] = (pr == null) ? ActivityManager.PROCESS_STATE_NONEXISTENT :
		pr.curProcState;
		if (scores != null) {
		scores[i] = (pr == null) ? ProcessList.INVALID_ADJ : pr.curAdj;
		}
		}
		}
		}