diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-08-09 16:38:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-09 16:38:09 -0700 |
| commit | d021b6b14a801cce1b575d536323af65587f2fbe (patch) | |
| tree | f8f389d3e73e927d3a204cb371a144475d9bd8fb /core | |
| parent | 1719817211743cabf53e06761ad5540518544273 (diff) | |
| parent | b0037316c4bbaf9d5b3ee8af563caf2539def564 (diff) | |
| download | frameworks_base-d021b6b14a801cce1b575d536323af65587f2fbe.zip frameworks_base-d021b6b14a801cce1b575d536323af65587f2fbe.tar.gz frameworks_base-d021b6b14a801cce1b575d536323af65587f2fbe.tar.bz2 | |
am b0037316: Merge "More stuff I need for the proc stats UI." into klp-dev
* commit 'b0037316c4bbaf9d5b3ee8af563caf2539def564':
More stuff I need for the proc stats UI.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/app/IProcessStats.aidl | 1 | ||||
| -rw-r--r-- | core/java/com/android/internal/app/ProcessStats.java | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/core/java/com/android/internal/app/IProcessStats.aidl b/core/java/com/android/internal/app/IProcessStats.aidl index e4c8bd2..047424d 100644 --- a/core/java/com/android/internal/app/IProcessStats.aidl +++ b/core/java/com/android/internal/app/IProcessStats.aidl @@ -22,4 +22,5 @@ import com.android.internal.app.ProcessStats; interface IProcessStats { byte[] getCurrentStats(out List<ParcelFileDescriptor> historic); + int getCurrentMemoryState(); } diff --git a/core/java/com/android/internal/app/ProcessStats.java b/core/java/com/android/internal/app/ProcessStats.java index 7eadbb5..ac9bf16 100644 --- a/core/java/com/android/internal/app/ProcessStats.java +++ b/core/java/com/android/internal/app/ProcessStats.java @@ -1682,7 +1682,7 @@ public final class ProcessStats implements Parcelable { } } - static long dumpSingleServiceTime(PrintWriter pw, String prefix, ServiceState service, + public static long dumpSingleServiceTime(PrintWriter pw, String prefix, ServiceState service, int serviceType, int curState, long curStartTime, long now) { long totalTime = 0; int printedScreen = -1; @@ -2403,15 +2403,15 @@ public final class ProcessStats implements Parcelable { public static final class ServiceState { final ProcessStats mStats; - final String mPackage; - final String mName; + public final String mPackage; + public final String mName; ProcessState mProc; int mActive = 1; - static final int SERVICE_STARTED = 0; - static final int SERVICE_BOUND = 1; - static final int SERVICE_EXEC = 2; + public static final int SERVICE_STARTED = 0; + public static final int SERVICE_BOUND = 1; + public static final int SERVICE_EXEC = 2; static final int SERVICE_COUNT = 3; int[] mDurationsTable; |