Merge "Move enums file to new directory" am: 53cfe5eb38 (0fd36c48) · Commits · e / os / android_frameworks_base

Android.bp

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -671,6 +671,7 @@ gensrcs {

	srcs: [		srcs: [
	":ipconnectivity-proto-src",		":ipconnectivity-proto-src",
			":libstats_atom_enum_protos",
	"core/proto/*/.proto",		"core/proto/*/.proto",
	"libs/incident/*/.proto",		"libs/incident/*/.proto",
	],		],
	@@ -697,6 +698,7 @@ gensrcs {

	srcs: [		srcs: [
	":ipconnectivity-proto-src",		":ipconnectivity-proto-src",
			":libstats_atom_enum_protos",
	"core/proto/*/.proto",		"core/proto/*/.proto",
	"libs/incident/*/.proto",		"libs/incident/*/.proto",
	],		],
	@@ -812,6 +814,7 @@ java_library_host {
	name: "platformprotos",		name: "platformprotos",
	srcs: [		srcs: [
	":ipconnectivity-proto-src",		":ipconnectivity-proto-src",
			":libstats_atom_enum_protos",
	":libstats_internal_protos",		":libstats_internal_protos",
	"cmds/am/proto/instrumentation_data.proto",		"cmds/am/proto/instrumentation_data.proto",
	"cmds/statsd/src/*/.proto",		"cmds/statsd/src/*/.proto",
	@@ -845,6 +848,7 @@ java_library {
	sdk_version: "9",		sdk_version: "9",
	srcs: [		srcs: [
	":ipconnectivity-proto-src",		":ipconnectivity-proto-src",
			":libstats_atom_enum_protos",
	"core/proto/*/.proto",		"core/proto/*/.proto",
	"libs/incident/proto/android/os/*/.proto",		"libs/incident/proto/android/os/*/.proto",
	],		],
	@@ -860,6 +864,7 @@ java_library {

	srcs: [		srcs: [
	":ipconnectivity-proto-src",		":ipconnectivity-proto-src",
			":libstats_atom_enum_protos",
	"core/proto/*/.proto",		"core/proto/*/.proto",
	"libs/incident/proto/android/os/*/.proto",		"libs/incident/proto/android/os/*/.proto",
	],		],
	@@ -880,7 +885,9 @@ cc_defaults {

	proto: {		proto: {
	export_proto_headers: true,		export_proto_headers: true,
	include_dirs: ["external/protobuf/src"],		include_dirs: [
			"external/protobuf/src",
			],
	},		},

	cflags: [		cflags: [
	@@ -891,6 +898,7 @@ cc_defaults {

	srcs: [		srcs: [
	":ipconnectivity-proto-src",		":ipconnectivity-proto-src",
			":libstats_atom_enum_protos",
	"core/proto/*/.proto",		"core/proto/*/.proto",
	],		],
	}		}

cmds/statsd/src/atom_field_options.proto

deleted100644 → 0

+0 −116

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (C) 2018 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";

	package android.os.statsd;
	option java_package = "com.android.os";
	option java_multiple_files = true;
	option java_outer_classname = "AtomFieldOptions";

	import "google/protobuf/descriptor.proto";

	// Used to annotate an atom that represents a state change. A state change atom must have exactly
	// ONE exclusive state field, and any number of primary key fields. For example, message
	// UidProcessStateChanged {
	// optional int32 uid = 1 [(state_field_option).primary_field = true];
	// optional android.app.ProcessStateEnum state =
	// 2 [(state_field_option).exclusive_state = true];
	// }
	// Each UidProcessStateChanged atom event represents a state change for a specific uid.
	// A new state automatically overrides the previous state.
	//
	// If the atom has 2 or more primary fields, it means the combination of the
	// primary fields are the primary key.
	// For example:
	// message ThreadStateChanged {
	// optional int32 pid = 1 [(state_field_option).primary_field = true];
	// optional int32 tid = 2 [(state_field_option).primary_field = true];
	// optional int32 state = 3 [(state_field_option).exclusive_state = true];
	// }
	//
	// Sometimes, there is no primary key field, when the state is GLOBAL.
	// For example,
	// message ScreenStateChanged {
	// optional android.view.DisplayStateEnum state =
	// 1 [(state_field_option).exclusive_state = true];
	// }
	//
	// For state atoms with attribution chain, sometimes the primary key is the first uid in the chain.
	// For example:
	// message AudioStateChanged {
	// repeated AttributionNode attribution_node = 1
	// [(stateFieldOption).primary_field_first_uid = true];
	//
	// enum State {
	// OFF = 0;
	// ON = 1;
	// // RESET indicates all audio stopped. Used when it (re)starts (e.g. after it crashes).
	// RESET = 2;
	// }
	// optional State state = 2 [(stateFieldOption).exclusive_state = true];
	// }
	message StateAtomFieldOption {
	// Fields that represent the key that the state belongs to.
	// Used on simple proto fields. Do not use on attribution chains.
	optional bool primary_field = 1 [default = false];

	// The field that represents the state. It's an exclusive state.
	optional bool exclusive_state = 2 [default = false];

	// Used on an attribution chain field to indicate that the first uid is the
	// primary field.
	optional bool primary_field_first_uid = 3 [default = false];

	// Note: We cannot annotate directly on the enums because many enums are imported from other
	// proto files in the platform. proto-lite cc library does not support annotations unfortunately

	// Knowing the default state value allows state trackers to remove entries that become the
	// default state. If there is no default value specified, the default value is unknown, and all
	// states will be tracked in memory.
	optional int32 default_state_value = 4;

	// A reset state signals all states go to default value. For example, BLE reset means all active
	// BLE scans are to be turned off.
	optional int32 trigger_state_reset_value = 5;

	// If the state change needs to count nesting.
	optional bool nested = 6 [default = true];
	}

	// Used to generate StatsLog.write APIs.
	enum LogMode {
	MODE_UNSET = 0;
	// Log fields as their actual types e.g., all primary data types.
	// Or fields that are hardcoded in stats_log_api_gen tool e.g., AttributionNode
	MODE_AUTOMATIC = 1;
	// Log fields in their proto binary format. These fields will not be parsed in statsd
	MODE_BYTES = 2;
	}

	extend google.protobuf.FieldOptions {
	// Flags to decorate an atom that presents a state change.
	optional StateAtomFieldOption state_field_option = 50000;

	// Flags to decorate the uid fields in an atom.
	optional bool is_uid = 50001 [default = false];

	optional LogMode log_mode = 50002 [default = MODE_AUTOMATIC];

	repeated string module = 50004;

	optional bool truncate_timestamp = 50005 [default = false];
	}

cmds/statsd/src/atoms.proto

deleted100644 → 0

+0 −11217

File deleted.

Preview size limit exceeded, changes collapsed.

cmds/statsd/tests/LogEvent_test.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,8 +16,8 @@

	#include <gtest/gtest.h>		#include <gtest/gtest.h>

	#include "frameworks/base/core/proto/android/stats/launcher/launcher.pb.h"
	#include "frameworks/proto_logging/stats/atoms.pb.h"		#include "frameworks/proto_logging/stats/atoms.pb.h"
			#include "frameworks/proto_logging/stats/enums/stats/launcher/launcher.pb.h"
	#include "log/log_event_list.h"		#include "log/log_event_list.h"
	#include "stats_event.h"		#include "stats_event.h"

core/proto/Android.bp

deleted100644 → 0

+0 −30

Original line number	Original line	Diff line number	Diff line
	// Copyright (C) 2018 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.

	// C++ library for Bluetooth platform wide protobuf definitions
	cc_library_static {
	name: "libbt-platform-protos-lite",
	host_supported: true,
	proto: {
	export_proto_headers: true,
	type: "lite",
	},
	srcs: [
	"android/bluetooth/a2dp/enums.proto",
	"android/bluetooth/enums.proto",
	"android/bluetooth/hci/enums.proto",
	"android/bluetooth/hfp/enums.proto",
	"android/bluetooth/smp/enums.proto",
	],
	}