diff --git a/core/java/com/android/internal/app/IProcessStats.aidl b/core/java/com/android/internal/app/IProcessStats.aidl index e4c8bd20dde60..047424d54eb82 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 historic); + int getCurrentMemoryState(); } diff --git a/core/java/com/android/internal/app/ProcessStats.java b/core/java/com/android/internal/app/ProcessStats.java index 7eadbb5dee10b..ac9bf16655dcb 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; diff --git a/services/java/com/android/server/am/ProcessStatsService.java b/services/java/com/android/server/am/ProcessStatsService.java index 6611a24b65775..4ba26fbe31079 100644 --- a/services/java/com/android/server/am/ProcessStatsService.java +++ b/services/java/com/android/server/am/ProcessStatsService.java @@ -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]");