am 0c95b8c8: am 463850e0: Merge "Fix issue #10795385: System process crash... (19eacd56) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -14751,7 +14751,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		}

		private final void setProcessTrackerState(ProcessRecord proc, int memFactor, long now) {
		if (proc.thread != null) {
		if (proc.thread != null && proc.baseProcessTracker != null) {
		proc.baseProcessTracker.setState(proc.repProcState, memFactor, now, proc.pkgList);
		}
		}

+22 −16

Original line number	Diff line number	Diff line
		@@ -567,7 +567,8 @@ final class ProcessRecord {
		*/
		public boolean addPackage(String pkg, ProcessStatsService tracker) {
		if (!pkgList.containsKey(pkg)) {
		pkgList.put(pkg, tracker.getProcessStateLocked(pkg, info.uid, processName));
		pkgList.put(pkg, baseProcessTracker != null
		? tracker.getProcessStateLocked(pkg, info.uid, processName) : null);
		return true;
		}
		return false;
		@@ -592,10 +593,11 @@ final class ProcessRecord {
		* Delete all packages from list except the package indicated in info
		*/
		public void resetPackageList(ProcessStatsService tracker) {
		final int N = pkgList.size();
		if (baseProcessTracker != null) {
		long now = SystemClock.uptimeMillis();
		baseProcessTracker.setState(ProcessStats.STATE_NOTHING,
		tracker.getMemFactorLocked(), now, pkgList);
		final int N = pkgList.size();
		if (N != 1) {
		for (int i=0; i<N; i++) {
		ProcessStats.ProcessState ps = pkgList.valueAt(i);
		@@ -612,6 +614,10 @@ final class ProcessRecord {
		ps.makeActive();
		}
		}
		} else if (N != 1) {
		pkgList.clear();
		pkgList.put(info.packageName, null);
		}
		}

		public String[] getPackageList() {