From 9a862de7e95b02fcda6ff527ef7abbdd100b303d Mon Sep 17 00:00:00 2001
From: Howard Ro <yro@google.com>
Date: Thu, 11 Oct 2018 16:03:33 -0700
Subject: [PATCH] Move/rename stats_enums.proto's directory/name

Migrate stats_enums.proto to core/proto/android/stats/ directory for the
consistency with other enums file imported in atoms.proto

Test: mma
Change-Id: I79f068889ac5c34c6fd8c5966687669efb37d180
---
 Android.bp                                                  | 3 ---
 cmds/statsd/src/atoms.proto                                 | 6 +++---
 .../proto/android/stats/enums.proto                         | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename proto/src/stats_enums.proto => core/proto/android/stats/enums.proto (91%)

diff --git a/Android.bp b/Android.bp
index 7e71bdfe35c7c..9f7c17cdd2c52 100644
--- a/Android.bp
+++ b/Android.bp
@@ -835,7 +835,6 @@ java_library_host {
         "cmds/statsd/src/**/*.proto",
         "core/proto/**/*.proto",
         "libs/incident/proto/**/*.proto",
-        "proto/src/stats_enums.proto",
     ],
     proto: {
         include_dirs: ["external/protobuf/src"],
@@ -873,7 +872,6 @@ java_library {
     srcs: [
         "core/proto/**/*.proto",
         "libs/incident/proto/android/os/**/*.proto",
-        "proto/src/stats_enums.proto",
     ],
     // Protos have lots of MissingOverride and similar.
     errorprone: {
@@ -899,7 +897,6 @@ cc_library {
     srcs: [
         "core/proto/**/*.proto",
         "libs/incident/**/*.proto",
-        "proto/src/stats_enums.proto",
     ],
 
     target: {
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index 9d83afdeb8198..cb8a71c9b60ef 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -29,8 +29,8 @@ import "frameworks/base/core/proto/android/server/enums.proto";
 import "frameworks/base/core/proto/android/telecomm/enums.proto";
 import "frameworks/base/core/proto/android/telephony/enums.proto";
 import "frameworks/base/core/proto/android/view/enums.proto";
-import "frameworks/base/proto/src/stats_enums.proto";
 import "frameworks/base/core/proto/android/service/procstats.proto";
+import "frameworks/base/core/proto/android/stats/enums.proto";
 import "frameworks/base/core/proto/android/internal/powerprofile.proto";
 
 /**
@@ -1923,7 +1923,7 @@ message GenericAtom {
     optional int32 uid = 1 [(is_uid) = true];
 
     // An event_id indicates the type of event.
-    optional android.os.statsd.EventType event_id = 2;
+    optional android.stats.EventType event_id = 2;
 }
 
 /**
@@ -2675,4 +2675,4 @@ message ProcStats {
  */
 message PowerProfile {
     optional com.android.internal.os.PowerProfileProto power_profile_proto = 1;
-}
\ No newline at end of file
+}
diff --git a/proto/src/stats_enums.proto b/core/proto/android/stats/enums.proto
similarity index 91%
rename from proto/src/stats_enums.proto
rename to core/proto/android/stats/enums.proto
index 6c892cfeae6c1..2320a01b324ce 100644
--- a/proto/src/stats_enums.proto
+++ b/core/proto/android/stats/enums.proto
@@ -16,8 +16,7 @@
 
 syntax = "proto2";
 
-package android.os.statsd;
-option java_package = "com.android.os";
+package android.stats;
 option java_outer_classname = "StatsEnums";
 
 enum EventType {