Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a862de7 authored by Howard Ro's avatar Howard Ro
Browse files

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
parent 35315bdb
Loading
Loading
Loading
Loading
+0 −3
Original line number Original line Diff line number Diff line
@@ -835,7 +835,6 @@ java_library_host {
        "cmds/statsd/src/**/*.proto",
        "cmds/statsd/src/**/*.proto",
        "core/proto/**/*.proto",
        "core/proto/**/*.proto",
        "libs/incident/proto/**/*.proto",
        "libs/incident/proto/**/*.proto",
        "proto/src/stats_enums.proto",
    ],
    ],
    proto: {
    proto: {
        include_dirs: ["external/protobuf/src"],
        include_dirs: ["external/protobuf/src"],
@@ -873,7 +872,6 @@ java_library {
    srcs: [
    srcs: [
        "core/proto/**/*.proto",
        "core/proto/**/*.proto",
        "libs/incident/proto/android/os/**/*.proto",
        "libs/incident/proto/android/os/**/*.proto",
        "proto/src/stats_enums.proto",
    ],
    ],
    // Protos have lots of MissingOverride and similar.
    // Protos have lots of MissingOverride and similar.
    errorprone: {
    errorprone: {
@@ -899,7 +897,6 @@ cc_library {
    srcs: [
    srcs: [
        "core/proto/**/*.proto",
        "core/proto/**/*.proto",
        "libs/incident/**/*.proto",
        "libs/incident/**/*.proto",
        "proto/src/stats_enums.proto",
    ],
    ],


    target: {
    target: {
+3 −3
Original line number Original line Diff line number Diff line
@@ -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/telecomm/enums.proto";
import "frameworks/base/core/proto/android/telephony/enums.proto";
import "frameworks/base/core/proto/android/telephony/enums.proto";
import "frameworks/base/core/proto/android/view/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/service/procstats.proto";
import "frameworks/base/core/proto/android/stats/enums.proto";
import "frameworks/base/core/proto/android/internal/powerprofile.proto";
import "frameworks/base/core/proto/android/internal/powerprofile.proto";


/**
/**
@@ -1923,7 +1923,7 @@ message GenericAtom {
    optional int32 uid = 1 [(is_uid) = true];
    optional int32 uid = 1 [(is_uid) = true];


    // An event_id indicates the type of event.
    // An event_id indicates the type of event.
    optional android.os.statsd.EventType event_id = 2;
    optional android.stats.EventType event_id = 2;
}
}


/**
/**
+1 −2
Original line number Original line Diff line number Diff line
@@ -16,8 +16,7 @@


syntax = "proto2";
syntax = "proto2";


package android.os.statsd;
package android.stats;
option java_package = "com.android.os";
option java_outer_classname = "StatsEnums";
option java_outer_classname = "StatsEnums";


enum EventType {
enum EventType {