From 69cb00b8dda60eff7449b69723f4e73a28e944f8 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Fri, 9 Aug 2013 16:16:56 -0700
Subject: [PATCH] More stuff I need for the proc stats UI.

Change-Id: I5f05b79bc4d5766a80f2db9d20ba8078b60c1b00
---
 .../java/com/android/internal/app/IProcessStats.aidl |  1 +
 core/java/com/android/internal/app/ProcessStats.java | 12 ++++++------
 .../com/android/server/am/ProcessStatsService.java   |  6 ++++++
 3 files changed, 13 insertions(+), 6 deletions(-)

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<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 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]");