Merge "Small fixes to StatsManager API." into pi-dev (1cc4099e) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -373,7 +373,6 @@ package android.app {
		}

		public final class StatsManager {
		method public boolean addConfiguration(long, byte[], java.lang.String, java.lang.String);
		method public boolean addConfiguration(long, byte[]);
		method public byte[] getData(long);
		method public byte[] getMetadata();

core/java/android/app/StatsManager.java

+6 −12

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		package android.app;

		import android.Manifest;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.os.IBinder;
		@@ -80,14 +81,6 @@ public final class StatsManager {
		public StatsManager() {
		}

		/**
		* Temporary. Will be deleted.
		*/
		@RequiresPermission(Manifest.permission.DUMP)
		public boolean addConfiguration(long configKey, byte[] config, String a, String b) {
		return addConfiguration(configKey, config);
		}

		/**
		* Clients can send a configuration and simultaneously registers the name of a broadcast
		* receiver that listens for when it should request data.
		@@ -233,10 +226,11 @@ public final class StatsManager {
		* the retrieved metrics from statsd memory.
		*
		* @param configKey Configuration key to retrieve data from.
		* @return Serialized ConfigMetricsReportList proto. Returns null on failure.
		* @return Serialized ConfigMetricsReportList proto. Returns null on failure (eg, if statsd
		* crashed).
		*/
		@RequiresPermission(Manifest.permission.DUMP)
		public byte[] getData(long configKey) {
		public @Nullable byte[] getData(long configKey) {
		synchronized (this) {
		try {
		IStatsManager service = getIStatsManagerLocked();
		@@ -257,10 +251,10 @@ public final class StatsManager {
		* the actual metrics themselves (metrics must be collected via {@link #getData(String)}.
		* This getter is not destructive and will not reset any metrics/counters.
		*
		* @return Serialized StatsdStatsReport proto. Returns null on failure.
		* @return Serialized StatsdStatsReport proto. Returns null on failure (eg, if statsd crashed).
		*/
		@RequiresPermission(Manifest.permission.DUMP)
		public byte[] getMetadata() {
		public @Nullable byte[] getMetadata() {
		synchronized (this) {
		try {
		IStatsManager service = getIStatsManagerLocked();

core/java/android/util/StatsLog.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,7 @@ import android.os.Process;

		/**
		* StatsLog provides an API for developers to send events to statsd. The events can be used to
		* define custom metrics inside statsd. We will rate-limit how often the calls can be made inside
		* statsd.
		* define custom metrics inside statsd.
		*/
		public final class StatsLog extends StatsLogInternal {
		private static final String TAG = "StatsManager";