diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-03-07 18:12:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-07 18:12:30 +0000 |
| commit | 785d764bd56b2d41216aa52ab8f6b6af9179f9c9 (patch) | |
| tree | 7d6a1de560c7af56598a405fd8e7f6f05774999a | |
| parent | faddd77a917dd423aee5fc64c056c8c2e0ce6f9a (diff) | |
| parent | cb15c7a83b62a37e5def14413e37925391e5ea39 (diff) | |
| download | frameworks_base-785d764bd56b2d41216aa52ab8f6b6af9179f9c9.zip frameworks_base-785d764bd56b2d41216aa52ab8f6b6af9179f9c9.tar.gz frameworks_base-785d764bd56b2d41216aa52ab8f6b6af9179f9c9.tar.bz2 | |
Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev
| -rw-r--r-- | core/java/com/android/internal/app/ProcessStats.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/com/android/internal/app/ProcessStats.java b/core/java/com/android/internal/app/ProcessStats.java index 0cad33c..0aad0b5 100644 --- a/core/java/com/android/internal/app/ProcessStats.java +++ b/core/java/com/android/internal/app/ProcessStats.java @@ -1004,7 +1004,7 @@ public final class ProcessStats implements Parcelable { for (int iproc=pkgState.mProcesses.size()-1; iproc>=0; iproc--) { ProcessState ps = pkgState.mProcesses.valueAt(iproc); if (ps.isInUse() || ps.mCommonProcess.isInUse()) { - pkgState.mProcesses.valueAt(iproc).resetSafely(now); + ps.resetSafely(now); } else { pkgState.mProcesses.valueAt(iproc).makeDead(); pkgState.mProcesses.removeAt(iproc); @@ -1013,7 +1013,7 @@ public final class ProcessStats implements Parcelable { for (int isvc=pkgState.mServices.size()-1; isvc>=0; isvc--) { ServiceState ss = pkgState.mServices.valueAt(isvc); if (ss.isInUse()) { - pkgState.mServices.valueAt(isvc).resetSafely(now); + ss.resetSafely(now); } else { pkgState.mServices.removeAt(isvc); } @@ -3014,7 +3014,7 @@ public final class ProcessStats implements Parcelable { } public boolean isInUse() { - return mOwner != null; + return mOwner != null || mRestarting; } void add(ServiceState other) { |