Add missing key for temporary battery process event and missing tag id

for process
Test: tested locally

Change-Id: I1ef376ba9478e1e88ff09fb201078d4972d8d51b

diff --git a/cmds/statsd/src/stats_constants.proto b/cmds/statsd/src/stats_constants.proto
index 3f8bd1c..9758a2e 100644 (file)
--- a/cmds/statsd/src/stats_constants.proto
+++ b/cmds/statsd/src/stats_constants.proto
@@ -24,7 +24,8 @@ option java_outer_classname = "StatsConstantsProto";
 
 enum TagId {
   WAKELOCK = 1;
-  SCREEN = 1003;
+  SCREEN = 2;
+  PROCESS = 1112; // TODO: Temporary usage only for testing.
 }
 
 enum KeyId {

diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index 3105e37..e839003 100644 (file)
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -300,10 +300,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub
 
             // TODO: remove this once we figure out properly where and how
             // PROCESS_EVENT = 1112
-            // EVENT SUBTYPE: START = 1
-            // KEY_NAME: 1
+            // KEY_STATE = 1
+            // KEY_PACKAGE_NAME: 1002
             // KEY_UID: 2
-            StatsLog.writeArray(1112, 1, 1, name, 2, uid);
+            StatsLog.writeArray(1112, 1, 1, 1002, name, 2, uid);
         }
     }
 
@@ -313,10 +313,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub
 
             // TODO: remove this once we figure out properly where and how
             // PROCESS_EVENT = 1112
-            // EVENT SUBTYPE: CRASH = 2
-            // KEY_NAME: 1
+            // KEY_STATE = 1
+            // KEY_PACKAGE_NAME: 1002
             // KEY_UID: 2
-            StatsLog.writeArray(1112, 2, 1, name, 2, uid);
+            StatsLog.writeArray(1112, 1, 2, 1002, name, 2, uid);
         }
     }
 
@@ -550,10 +550,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub
         synchronized (mStats) {
             mStats.noteScreenStateLocked(state);
             // TODO: remove this once we figure out properly where and how
-            // SCREEN_EVENT = 1003
-            // State key: 1
+            // SCREEN_EVENT = 2
+            // KEY_STATE: 1
             // State value: state. We can change this to our own def later.
-            StatsLog.writeArray(1003, 1, state);
+            StatsLog.writeArray(2, 1, state);
         }
         if (DBG) Slog.d(TAG, "end noteScreenState");
     }
@@ -564,14 +564,14 @@ public final class BatteryStatsService extends IBatteryStats.Stub
             mStats.noteScreenBrightnessLocked(brightness);
         }
     }
-    
+
     public void noteUserActivity(int uid, int event) {
         enforceCallingPermission();
         synchronized (mStats) {
             mStats.noteUserActivityLocked(uid, event);
         }
     }
-    
+
     public void noteWakeUp(String reason, int reasonUid) {
         enforceCallingPermission();
         synchronized (mStats) {