Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #10795385: System process crash reinstalling GEL -" into klp-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2013-09-17 18:08:00 +00:00
committed by Android (Google) Code Review
parent 80645121fb e56c2c3f05
commit 463850e0c6
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -14749,7 +14749,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);
}
}

38
services/java/com/android/server/am/ProcessRecord.java
View File

@@ -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,25 +593,30 @@ final class ProcessRecord {
* Delete all packages from list except the package indicated in info
*/
public void resetPackageList(ProcessStatsService tracker) {
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);
if (ps != null && ps != baseProcessTracker) {
ps.makeInactive();
}
if (baseProcessTracker != null) {
long now = SystemClock.uptimeMillis();
baseProcessTracker.setState(ProcessStats.STATE_NOTHING,
tracker.getMemFactorLocked(), now, pkgList);
if (N != 1) {
for (int i=0; i<N; i++) {
ProcessStats.ProcessState ps = pkgList.valueAt(i);
if (ps != null && ps != baseProcessTracker) {
ps.makeInactive();
}
}
pkgList.clear();
ProcessStats.ProcessState ps = tracker.getProcessStateLocked(
info.packageName, info.uid, processName);
pkgList.put(info.packageName, ps);
if (thread != null && ps != baseProcessTracker) {
ps.makeActive();
}
}
} else if (N != 1) {
pkgList.clear();
ProcessStats.ProcessState ps = tracker.getProcessStateLocked(
info.packageName, info.uid, processName);
pkgList.put(info.packageName, ps);
if (thread != null && ps != baseProcessTracker) {
ps.makeActive();
}
pkgList.put(info.packageName, null);
}
}