Merge "Display wake reason atom" into rvc-dev am: 3ed0f13fe0 (b049a958) · Commits · e / os / android_frameworks_base

cmds/statsd/src/atoms.proto

+13 −1

Original line number	Diff line number	Diff line
		@@ -447,7 +447,7 @@ message Atom {
		}

		// Pulled events will start at field 10000.
		// Next: 10080
		// Next: 10082
		oneof pulled {
		WifiBytesTransfer wifi_bytes_transfer = 10000 [(module) = "framework"];
		WifiBytesTransferByFgBg wifi_bytes_transfer_by_fg_bg = 10001 [(module) = "framework"];
		@@ -538,6 +538,7 @@ message Atom {
		SimSlotState sim_slot_state = 10078 [(module) = "telephony"];
		SupportedRadioAccessFamily supported_radio_access_family = 10079 [(module) = "telephony"];
		SettingSnapshot setting_snapshot = 10080 [(module) = "framework"];
		DisplayWakeReason display_wake_reason = 10081 [(module) = "framework"];
		}

		// DO NOT USE field numbers above 100,000 in AOSP.
		@@ -9632,6 +9633,17 @@ message AccessibilityServiceReported {
		optional android.stats.accessibility.ServiceStatus service_status = 2;
		}

		message DisplayWakeReason {
		// Wake_up_reason code
		// If LOWORD(wake_up_reason) = 0
		// reference to HIWORD(wake_up_reason) PowerManager.WAKE_REASON_XXX
		// else reference wake_up_reason to
		// frameworks/base/services/core/java/com/android/server/power/Notifier.java#DispWakeupReason
		optional int32 wake_up_reason = 1;
		// Count of wake up by reason
		optional int32 wake_times = 2;
		}

		/**
		* Logs app usage events.
		*/