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

am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev

Browse Source 
* commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
  More on issue #12031685 (DO NOT MERGE)
This commit is contained in:
Dianne Hackborn
2014-03-07 18:15:19 +00:00
committed by Android Git Automerger
parent cda61e95f6 785d764bd5
commit 8e904d565e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/app/ProcessStats.java
View File

@@ -1004,7 +1004,7 @@ public final class ProcessStats implements Parcelable {
for (int iproc=pkgState.mProcesses.size()-1; iproc>=0; iproc--) { for (int iproc=pkgState.mProcesses.size()-1; iproc>=0; iproc--) {
ProcessState ps = pkgState.mProcesses.valueAt(iproc); ProcessState ps = pkgState.mProcesses.valueAt(iproc);
if (ps.isInUse() || ps.mCommonProcess.isInUse()) { if (ps.isInUse() || ps.mCommonProcess.isInUse()) {
pkgState.mProcesses.valueAt(iproc).resetSafely(now); ps.resetSafely(now);
} else { } else {
pkgState.mProcesses.valueAt(iproc).makeDead(); pkgState.mProcesses.valueAt(iproc).makeDead();
pkgState.mProcesses.removeAt(iproc); pkgState.mProcesses.removeAt(iproc);
@@ -1013,7 +1013,7 @@ public final class ProcessStats implements Parcelable {
for (int isvc=pkgState.mServices.size()-1; isvc>=0; isvc--) { for (int isvc=pkgState.mServices.size()-1; isvc>=0; isvc--) {
ServiceState ss = pkgState.mServices.valueAt(isvc); ServiceState ss = pkgState.mServices.valueAt(isvc);
if (ss.isInUse()) { if (ss.isInUse()) {
pkgState.mServices.valueAt(isvc).resetSafely(now); ss.resetSafely(now);
} else { } else {
pkgState.mServices.removeAt(isvc); pkgState.mServices.removeAt(isvc);
} }
@@ -3014,7 +3014,7 @@ public final class ProcessStats implements Parcelable {
} }
public boolean isInUse() { public boolean isInUse() {
return mOwner != null; return mOwner != null || mRestarting;
} }
void add(ServiceState other) { void add(ServiceState other) {