Merge "Statsd atom: pull Build information" (2a71dae5) · Commits · e / os / android_frameworks_base

cmds/statsd/src/atoms.proto

+35 −0

Original line number	Diff line number	Diff line
		@@ -205,6 +205,7 @@ message Atom {
		DeviceCalculatedPowerBlameOther device_calculated_power_blame_other = 10041;
		ProcessMemoryHighWaterMark process_memory_high_water_mark = 10042;
		BatteryLevel battery_level = 10043;
		BuildInformation build_information = 10044;
		}

		// DO NOT USE field numbers above 100,000 in AOSP.
		@@ -3330,6 +3331,40 @@ message CpuTimePerThreadFreq {
		optional int32 time_millis = 7;
		}

		/**
		* Pulls information about the device's build.
		*/
		message BuildInformation {
		// Build.FINGERPRINT. A string that uniquely identifies this build. Do not parse.
		// E.g. may be composed of the brand, product, device, release, id, incremental, type, and tags.
		optional string fingerprint = 1;

		// Build.BRAND. The consumer-visible brand with which the product/hardware will be associated.
		optional string brand = 2;

		// Build.PRODUCT. The name of the overall product.
		optional string product = 3;

		// Build.DEVICE. The name of the industrial design.
		optional string device = 4;

		// Build.VERSION.RELEASE. The user-visible version string. E.g., "1.0" or "3.4b5" or "bananas".
		optional string version_release = 5;

		// Build.ID. E.g. a label like "M4-rc20".
		optional string id = 6;

		// Build.VERSION.INCREMENTAL. The internal value used by the underlying source control to
		// represent this build.
		optional string version_incremental = 7;

		// Build.TYPE. The type of build, like "user" or "eng".
		optional string type = 8;

		// Build.TAGS. Comma-separated tags describing the build, like "unsigned,debug".
		optional string tags = 9;
		}

		/**
		* Pulls on-device BatteryStats power use calculations for the overall device.
		*/

cmds/statsd/src/external/StatsPullerManager.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -265,6 +265,11 @@ const std::map<int, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = {
		{{}, {},
		1 * NS_PER_SEC,
		new StatsCompanionServicePuller(android::util::DEVICE_CALCULATED_POWER_BLAME_OTHER)}},
		// BuildInformation.
		{android::util::BUILD_INFORMATION,
		{{}, {},
		1 * NS_PER_SEC,
		new StatsCompanionServicePuller(android::util::BUILD_INFORMATION)}},
		};

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

services/core/java/com/android/server/stats/StatsCompanionService.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import android.net.wifi.WifiActivityEnergyInfo;
		import android.os.BatteryStats;
		import android.os.BatteryStatsInternal;
		import android.os.Binder;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Environment;
		import android.os.FileUtils;
		@@ -1517,6 +1518,21 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		pulledData.add(e);
		}

		private void pullBuildInformation(int tagId,
		long elapsedNanos, long wallClockNanos, List<StatsLogEventWrapper> pulledData) {
		StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos);
		e.writeString(Build.FINGERPRINT);
		e.writeString(Build.BRAND);
		e.writeString(Build.PRODUCT);
		e.writeString(Build.DEVICE);
		e.writeString(Build.VERSION.RELEASE);
		e.writeString(Build.ID);
		e.writeString(Build.VERSION.INCREMENTAL);
		e.writeString(Build.TYPE);
		e.writeString(Build.TAGS);
		pulledData.add(e);
		}

		private BatteryStatsHelper getBatteryStatsHelper() {
		if (mBatteryStatsHelper == null) {
		final long callingToken = Binder.clearCallingIdentity();
		@@ -1810,6 +1826,10 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		pullPowerProfile(tagId, elapsedNanos, wallClockNanos, ret);
		break;
		}
		case StatsLog.BUILD_INFORMATION: {
		pullBuildInformation(tagId, elapsedNanos, wallClockNanos, ret);
		break;
		}
		case StatsLog.PROCESS_CPU_TIME: {
		pullProcessCpuTime(tagId, elapsedNanos, wallClockNanos, ret);
		break;