From 3e595b07c42f7aef10f84a58dc112eceb0bbf4ad Mon Sep 17 00:00:00 2001
From: Stefan Lafon <stlafon@google.com>
Date: Mon, 2 Oct 2017 20:14:25 -0700
Subject: [PATCH] Check in new version of stats_events.proto. Rename a field.

Test: The code compiles, and most changes are cosmetic.

Change-Id: Iae06d7bbbe0212067de4302d4004d89d45812176
---
 cmds/statsd/src/stats_events.proto | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/cmds/statsd/src/stats_events.proto b/cmds/statsd/src/stats_events.proto
index dffc68e21bda6..1e17895746760 100644
--- a/cmds/statsd/src/stats_events.proto
+++ b/cmds/statsd/src/stats_events.proto
@@ -23,13 +23,19 @@ option java_package = "com.android.os";
 option java_outer_classname = "StatsEventProto";
 
 message StatsEvent {
-  oneof log_entry_event {
+  oneof event {
+    // Screen state change.
     ScreenStateChange screen_state_change = 2;
+    // Process state change.
     ProcessStateChange process_state_change = 1112;
   }
 }
 
+// Logs changes in screen state. This event is logged in
+// frameworks/base/services/core/java/com/android/server/am/BatteryStatsService.java
 message ScreenStateChange {
+  // Screen state enums follow the values defined in below file.
+  // frameworks/base/core/java/android/view/Display.java
   enum State {
     STATE_UNKNOWN = 0;
     STATE_OFF = 1;
@@ -38,20 +44,20 @@ message ScreenStateChange {
     STATE_DOZE_SUSPEND = 4;
     STATE_VR = 5;
   }
+  // New screen state.
   optional State display_state = 1;
 }
 
+// Logs changes in process state. This event is logged in
+// frameworks/base/services/core/java/com/android/server/am/BatteryStatsService.java
 message ProcessStateChange {
+  // Type of process event.
   enum State {
     START = 1;
     CRASH = 2;
   }
   optional State state = 1;
 
+  // UID associated with the package.
   optional int32 uid = 2;
-
-  optional string package_name = 1002;
-
-  optional int32 package_version = 3;
-  optional string package_version_string = 4;
 }