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

Commit 4d2defc4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move Field proto out of stats_log.proto to keep it clean."

parents c513a1ca d19bcae4

cmds/statsd/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ statsd_common_src := \ 
    ../../core/java/android/os/IStatsManager.aidl \

    src/stats_log.proto \

    src/statsd_config.proto \

    src/statsd_internal.proto \

    src/atoms.proto \

    src/field_util.cpp \

    src/stats_log_util.cpp \

cmds/statsd/src/dimension.cpp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "Log.h"



#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"

#include "frameworks/base/cmds/statsd/src/statsd_internal.pb.h"

#include "dimension.h"

#include "field_util.h"

cmds/statsd/src/field_util.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#pragma once



#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"

#include "frameworks/base/cmds/statsd/src/statsd_internal.pb.h"

#include "frameworks/base/cmds/statsd/src/stats_log.pb.h"



#include <unordered_map>

cmds/statsd/src/stats_log.proto

+0 −6
Original line number Diff line number Diff line
@@ -24,12 +24,6 @@ option java_outer_classname = "StatsLog"; 


import "frameworks/base/cmds/statsd/src/atoms.proto";



message Field {

  optional int32 field = 1;

  optional int32 position_index = 2 [default = -1];

  repeated Field child = 3;

}



message DimensionsValue {

  optional int32 field = 1;

cmds/statsd/src/statsd_internal.proto

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



syntax = "proto2";

option optimize_for = LITE_RUNTIME;



package android.os.statsd;



option java_package = "com.android.os";

option java_outer_classname = "StatsdInternalProto";



message Field {

  optional int32 field = 1;

  optional int32 position_index = 2 [default = -1];

  repeated Field child = 3;

}