Merge "Restrict TrafficStats due to privacy concerns." into nyc-dev am: 6b432fa255 (b6f9e052) · Commits · e / os / android_frameworks_base

core/java/android/net/TrafficStats.java

+66 −9

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.net;
		import android.annotation.SystemApi;
		import android.app.DownloadManager;
		import android.app.backup.BackupManager;
		import android.app.usage.NetworkStatsManager;
		import android.content.Context;
		import android.media.MediaPlayer;
		import android.os.RemoteException;
		@@ -37,8 +38,12 @@ import java.net.SocketException;
		* bytes transmitted and received and network packets transmitted and received,
		* over all interfaces, over the mobile interface, and on a per-UID basis.
		* <p>
		* These statistics may not be available on all platforms. If the statistics
		* are not supported by this device, {@link #UNSUPPORTED} will be returned.
		* These statistics may not be available on all platforms. If the statistics are
		* not supported by this device, {@link #UNSUPPORTED} will be returned.
		* <p>
		* Note that the statistics returned by this class reset and start from zero
		* after every reboot. To access more robust historical network statistics data,
		* use {@link NetworkStatsManager} instead.
		*/
		public class TrafficStats {
		/**
		@@ -497,14 +502,27 @@ public class TrafficStats {
		* monotonically since device boot. Statistics are measured at the network
		* layer, so they include both TCP and UDP usage.
		* <p>
		* Before {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, this may return
		* {@link #UNSUPPORTED} on devices where statistics aren't available.
		* Before {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, this may
		* return {@link #UNSUPPORTED} on devices where statistics aren't available.
		* <p>
		* Starting in {@link android.os.Build.VERSION_CODES#N} this will only
		* report traffic statistics for the calling UID. It will return
		* {@link #UNSUPPORTED} for all other UIDs for privacy reasons. To access
		* historical network statistics belonging to other UIDs, use
		* {@link NetworkStatsManager}.
		*
		* @see android.os.Process#myUid()
		* @see android.content.pm.ApplicationInfo#uid
		*/
		public static long getUidTxBytes(int uid) {
		// This isn't actually enforcing any security; it just returns the
		// unsupported value. The real filtering is done at the kernel level.
		final int callingUid = android.os.Process.myUid();
		if (callingUid == android.os.Process.SYSTEM_UID \|\| callingUid == uid) {
		return nativeGetUidStat(uid, TYPE_TX_BYTES);
		} else {
		return UNSUPPORTED;
		}
		}

		/**
		@@ -515,12 +533,25 @@ public class TrafficStats {
		* <p>
		* Before {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, this may return
		* {@link #UNSUPPORTED} on devices where statistics aren't available.
		* <p>
		* Starting in {@link android.os.Build.VERSION_CODES#N} this will only
		* report traffic statistics for the calling UID. It will return
		* {@link #UNSUPPORTED} for all other UIDs for privacy reasons. To access
		* historical network statistics belonging to other UIDs, use
		* {@link NetworkStatsManager}.
		*
		* @see android.os.Process#myUid()
		* @see android.content.pm.ApplicationInfo#uid
		*/
		public static long getUidRxBytes(int uid) {
		// This isn't actually enforcing any security; it just returns the
		// unsupported value. The real filtering is done at the kernel level.
		final int callingUid = android.os.Process.myUid();
		if (callingUid == android.os.Process.SYSTEM_UID \|\| callingUid == uid) {
		return nativeGetUidStat(uid, TYPE_RX_BYTES);
		} else {
		return UNSUPPORTED;
		}
		}

		/**
		@@ -531,12 +562,25 @@ public class TrafficStats {
		* <p>
		* Before {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, this may return
		* {@link #UNSUPPORTED} on devices where statistics aren't available.
		* <p>
		* Starting in {@link android.os.Build.VERSION_CODES#N} this will only
		* report traffic statistics for the calling UID. It will return
		* {@link #UNSUPPORTED} for all other UIDs for privacy reasons. To access
		* historical network statistics belonging to other UIDs, use
		* {@link NetworkStatsManager}.
		*
		* @see android.os.Process#myUid()
		* @see android.content.pm.ApplicationInfo#uid
		*/
		public static long getUidTxPackets(int uid) {
		// This isn't actually enforcing any security; it just returns the
		// unsupported value. The real filtering is done at the kernel level.
		final int callingUid = android.os.Process.myUid();
		if (callingUid == android.os.Process.SYSTEM_UID \|\| callingUid == uid) {
		return nativeGetUidStat(uid, TYPE_TX_PACKETS);
		} else {
		return UNSUPPORTED;
		}
		}

		/**
		@@ -547,12 +591,25 @@ public class TrafficStats {
		* <p>
		* Before {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, this may return
		* {@link #UNSUPPORTED} on devices where statistics aren't available.
		* <p>
		* Starting in {@link android.os.Build.VERSION_CODES#N} this will only
		* report traffic statistics for the calling UID. It will return
		* {@link #UNSUPPORTED} for all other UIDs for privacy reasons. To access
		* historical network statistics belonging to other UIDs, use
		* {@link NetworkStatsManager}.
		*
		* @see android.os.Process#myUid()
		* @see android.content.pm.ApplicationInfo#uid
		*/
		public static long getUidRxPackets(int uid) {
		// This isn't actually enforcing any security; it just returns the
		// unsupported value. The real filtering is done at the kernel level.
		final int callingUid = android.os.Process.myUid();
		if (callingUid == android.os.Process.SYSTEM_UID \|\| callingUid == uid) {
		return nativeGetUidStat(uid, TYPE_RX_PACKETS);
		} else {
		return UNSUPPORTED;
		}
		}

		/**