Merge "clean up comments" into pi-dev am: b8dcc91eb9 (23109c32) · Commits · e / os / android_frameworks_base

proto/src/metrics_constants.proto

+4 −5

Original line number	Diff line number	Diff line
		@@ -5313,11 +5313,11 @@ message MetricsEvent {
		// OS: P
		FIELD_DURATION_MILLIS = 1304;

		// Battery level in uA (0 - ~3,000,000 depending on device) when the current "mode" started.
		// Battery level in uAh (0 - ~3,000,000 depending on device) when the current "mode" started.
		// OS: P
		FIELD_START_BATTERY_UA = 1305;

		// Battery level in uA (0 - ~3,000,000 depending on device) when this event was created.
		// Battery level in uAh (0 - ~3,000,000 depending on device) when this event was created.
		// OS: P
		FIELD_END_BATTERY_UA = 1306;

		@@ -5346,7 +5346,6 @@ message MetricsEvent {
		// OS: P
		FIELD_QS_MODE = 1311;


		// OPEN: Settings->Developer Options->Default USB
		// CATEGORY: SETTINGS
		// OS: P
		@@ -5750,8 +5749,8 @@ message MetricsEvent {
		// OS: P
		FIELD_HIDDEN_API_SIGNATURE = 1394;

		// This value should never appear in log outputs - it is reserved for
		// internal platform metrics use.
		// The number of items in the shade when this notification event was logged.
		// OS: P
		NOTIFICATION_SHADE_COUNT = 1395;

		// ACTION: DND Settings > What to block

+5 −6

Original line number	Diff line number	Diff line
		@@ -184,19 +184,19 @@ message SystemMessage {
		NOTE_USB_AUDIO_ACCESSORY_NOT_SUPPORTED = 41;

		// Inform the user that a wrong password was detected while attempting to connect
		// to a Wi-Fi network
		// to a wifi network
		NOTE_WIFI_WRONG_PASSWORD = 42;

		// Inform the user that Wifi Wake will re-enable wifi when possible
		NOTE_WIFI_WAKE_ONBOARD = 43;

		// Inform the user that Wifi Wake has automatically re-enabled Wifi
		// Inform the user that Wifi Wake has automatically re-enabled wifi
		NOTE_WIFI_WAKE_TURNED_BACK_ON = 44;

		// Inform the user that unexpectedly rapid network usage is happening
		NOTE_NET_RAPID = 45;

		// Notify the user that carrier Wi-Fi networks are available.
		// Notify the user that carrier wifi networks are available.
		// Package: android
		NOTE_CARRIER_NETWORK_AVAILABLE = 46;

		@@ -248,10 +248,10 @@ message SystemMessage {
		// Package: com.android.systemui
		NOTE_TV_PIP = 1100;

		// Extreme battery saver notifiaction.
		// Extreme battery saver notification.
		NOTE_BATTERY_SAVER_WARNING = 1200;

		// Notify the user that open Wi-Fi networks are available.
		// Notify the user that open wifi networks are available.
		// Package: android
		NOTE_NETWORK_AVAILABLE = 17303299;

		@@ -261,7 +261,6 @@ message SystemMessage {

		// Notify the user about public volume state changes..
		// Package: com.android.systemui

		NOTE_STORAGE_PUBLIC = 0x53505542; // 1397773634

		// Notify the user about private volume state changes.