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

am b0037316: Merge "More stuff I need for the proc stats UI." into klp-dev

Browse Source 
* commit 'b0037316c4bbaf9d5b3ee8af563caf2539def564':
  More stuff I need for the proc stats UI.
This commit is contained in:
Dianne Hackborn
2013-08-09 16:38:09 -07:00
committed by Android Git Automerger
parent 1719817211 b0037316c4
commit d021b6b14a
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/app/IProcessStats.aidl
View File

@@ -22,4 +22,5 @@ import com.android.internal.app.ProcessStats;
interface IProcessStats {
byte[] getCurrentStats(out List<ParcelFileDescriptor> historic);
int getCurrentMemoryState();
}

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

@@ -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;

6
services/java/com/android/server/am/ProcessStatsService.java
View File

@@ -435,6 +435,12 @@ public final class ProcessStatsService extends IProcessStats.Stub {
return current.marshall();
}
public int getCurrentMemoryState() {
synchronized (mAm) {
return mLastMemOnlyState;
}
}
static private void dumpHelp(PrintWriter pw) {
pw.println("Process stats (procstats) dump options:");
pw.println(" [--checkin|-c|--csv] [--csv-screen] [--csv-proc] [--csv-mem]");