Snap for 6063219 from aabbd3c87329441edf4c5ee55f1d1d32f487fe83 to qt-qpr2-release (1d0ce5de) · Commits · e / os / android_frameworks_base

cmds/statsd/src/atoms.proto

+20 −1

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

		// Pulled events will start at field 10000.
		// Next: 10062
		// Next: 10067
		oneof pulled {
		WifiBytesTransfer wifi_bytes_transfer = 10000;
		WifiBytesTransferByFgBg wifi_bytes_transfer_by_fg_bg = 10001;
		@@ -390,6 +390,7 @@ message Atom {
		AppOps app_ops = 10060;
		ProcessSystemIonHeapSize process_system_ion_heap_size = 10061;
		VmsClientStats vms_client_stats = 10065;
		NotificationRemoteViews notification_remote_views = 10066;
		}

		// DO NOT USE field numbers above 100,000 in AOSP.
		@@ -4751,6 +4752,24 @@ message ProcStatsPkgProc {
		optional ProcessStatsSectionProto proc_stats_section = 1;
		}

		// Next Tag: 2
		message PackageRemoteViewInfoProto {
		optional string package_name = 1;
		// add per-package additional info here (like channels)
		}

		// Next Tag: 2
		message NotificationRemoteViewsProto {
		repeated PackageRemoteViewInfoProto package_remote_view_info = 1;
		}

		/**
		* Pulled from NotificationManagerService.java
		*/
		message NotificationRemoteViews {
		optional NotificationRemoteViewsProto notification_remote_views = 1;
		}

		message PowerProfileProto {
		optional double cpu_suspend = 1;

+3 −0

Original line number	Diff line number	Diff line
		@@ -271,6 +271,9 @@ std::map<int, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = {
		{android::util::VMS_CLIENT_STATS,
		{.additiveFields = {5, 6, 7, 8, 9, 10},
		.puller = new CarStatsPuller(android::util::VMS_CLIENT_STATS)}},
		// NotiifcationRemoteViews.
		{android::util::NOTIFICATION_REMOTE_VIEWS,
		{.puller = new StatsCompanionServicePuller(android::util::NOTIFICATION_REMOTE_VIEWS)}},
		};

		StatsPullerManager::StatsPullerManager() : mNextPullTimeNs(NO_ALARM_UPDATE) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -202,4 +202,6 @@ interface INotificationManager

		void setPrivateNotificationsAllowed(boolean allow);
		boolean getPrivateNotificationsAllowed();

		long pullStats(long startNs, int report, boolean doAgg, out List<ParcelFileDescriptor> stats);
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -5979,6 +5979,16 @@ public final class Settings {
		@TestApi
		public static final String USER_SETUP_COMPLETE = "user_setup_complete";

		/**
		* Whether the Auto Embedded Setup Wizard (0 = false, 1 = true) is in progress.
		* This differs from USER_SETUP_COMPLETE in that it can be reset back to 0
		* in case Setup Wizard has been re-enabled on Auto Embedded devices.
		*
		* @hide
		*/
		public static final String AUTOMOTIVE_USER_SETUP_IN_PROGRESS =
		"automotive_user_setup_in_progress";

		/**
		* Indicates that the user has not started setup personalization.
		* One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.

+8 −1

Original line number	Diff line number	Diff line
		@@ -139,6 +139,13 @@ message SecureSettingsProto {
		}
		optional AutomaticStorageManager automatic_storage_manager = 9;

		message Automotive {
		option (android.msg_privacy).dest = DEST_EXPLICIT;

		optional SettingProto automotive_user_setup_in_progress = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Automotive automotive = 77;

		message Backup {
		option (android.msg_privacy).dest = DEST_EXPLICIT;

		@@ -566,5 +573,5 @@ message SecureSettingsProto {

		// Please insert fields in alphabetical order and group them into messages
		// if possible (to avoid reaching the method limit).
		// Next tag = 77;
		// Next tag = 78;
		}