Merge changes from topic "multipath-datausage-backport" (df984fae) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -6949,6 +6949,7 @@ package android.app.usage {

		public static class NetworkStats.Bucket {
		ctor public NetworkStats.Bucket();
		method public int getDefaultNetwork();
		method public long getEndTimeStamp();
		method public int getMetered();
		method public int getRoaming();
		@@ -6960,6 +6961,9 @@ package android.app.usage {
		method public long getTxBytes();
		method public long getTxPackets();
		method public int getUid();
		field public static final int DEFAULT_NETWORK_ALL = -1; // 0xffffffff
		field public static final int DEFAULT_NETWORK_NO = 1; // 0x1
		field public static final int DEFAULT_NETWORK_YES = 2; // 0x2
		field public static final int METERED_ALL = -1; // 0xffffffff
		field public static final int METERED_NO = 1; // 0x1
		field public static final int METERED_YES = 2; // 0x2

core/java/android/app/usage/NetworkStats.java

+52 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,30 @@ public final class NetworkStats implements AutoCloseable {
		*/
		public static final int ROAMING_YES = 0x2;

		/** @hide */
		@IntDef(prefix = { "DEFAULT_NETWORK_" }, value = {
		DEFAULT_NETWORK_ALL,
		DEFAULT_NETWORK_NO,
		DEFAULT_NETWORK_YES
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface DefaultNetwork {}

		/**
		* Combined usage for this network regardless of whether it was the active default network.
		*/
		public static final int DEFAULT_NETWORK_ALL = -1;

		/**
		* Usage that occurs while this network is not the active default network.
		*/
		public static final int DEFAULT_NETWORK_NO = 0x1;

		/**
		* Usage that occurs while this network is the active default network.
		*/
		public static final int DEFAULT_NETWORK_YES = 0x2;

		/**
		* Special TAG value for total data across all tags
		*/
		@@ -223,6 +247,7 @@ public final class NetworkStats implements AutoCloseable {
		private int mUid;
		private int mTag;
		private int mState;
		private int mDefaultNetwork;
		private int mMetered;
		private int mRoaming;
		private long mBeginTimeStamp;
		@@ -274,6 +299,15 @@ public final class NetworkStats implements AutoCloseable {
		return 0;
		}

		private static @DefaultNetwork int convertDefaultNetwork(int defaultNetwork) {
		switch (defaultNetwork) {
		case android.net.NetworkStats.DEFAULT_NETWORK_ALL : return DEFAULT_NETWORK_ALL;
		case android.net.NetworkStats.DEFAULT_NETWORK_NO: return DEFAULT_NETWORK_NO;
		case android.net.NetworkStats.DEFAULT_NETWORK_YES: return DEFAULT_NETWORK_YES;
		}
		return 0;
		}

		public Bucket() {
		}

		@@ -338,6 +372,21 @@ public final class NetworkStats implements AutoCloseable {
		return mRoaming;
		}

		/**
		* Default network state. One of the following values:<p/>
		* <ul>
		* <li>{@link #DEFAULT_NETWORK_ALL}</li>
		* <li>{@link #DEFAULT_NETWORK_NO}</li>
		* <li>{@link #DEFAULT_NETWORK_YES}</li>
		* </ul>
		* <p>Indicates whether the network usage occurred on the system default network for this
		* type of traffic, or whether the application chose to send this traffic on a network that
		* was not the one selected by the system.
		*/
		public @DefaultNetwork int getDefaultNetwork() {
		return mDefaultNetwork;
		}

		/**
		* Start timestamp of the bucket's time interval. Defined in terms of "Unix time", see
		* {@link java.lang.System#currentTimeMillis}.
		@@ -539,6 +588,8 @@ public final class NetworkStats implements AutoCloseable {
		bucketOut.mUid = Bucket.convertUid(mRecycledSummaryEntry.uid);
		bucketOut.mTag = Bucket.convertTag(mRecycledSummaryEntry.tag);
		bucketOut.mState = Bucket.convertState(mRecycledSummaryEntry.set);
		bucketOut.mDefaultNetwork = Bucket.convertDefaultNetwork(
		mRecycledSummaryEntry.defaultNetwork);
		bucketOut.mMetered = Bucket.convertMetered(mRecycledSummaryEntry.metered);
		bucketOut.mRoaming = Bucket.convertRoaming(mRecycledSummaryEntry.roaming);
		bucketOut.mBeginTimeStamp = mStartTimeStamp;
		@@ -588,6 +639,7 @@ public final class NetworkStats implements AutoCloseable {
		bucketOut.mUid = Bucket.convertUid(getUid());
		bucketOut.mTag = Bucket.convertTag(mTag);
		bucketOut.mState = Bucket.STATE_ALL;
		bucketOut.mDefaultNetwork = Bucket.DEFAULT_NETWORK_ALL;
		bucketOut.mMetered = Bucket.METERED_ALL;
		bucketOut.mRoaming = Bucket.ROAMING_ALL;
		bucketOut.mBeginTimeStamp = mRecycledHistoryEntry.bucketStart;

core/java/android/app/usage/NetworkStatsManager.java

+65 −49

Original line number	Diff line number	Diff line
		@@ -60,10 +60,11 @@ import android.util.Log;
		* {@link #queryDetailsForUid} <p />
		* {@link #queryDetails} <p />
		* These queries do not aggregate over time but do aggregate over state, metered and roaming.
		* Therefore there can be multiple buckets for a particular key but all Bucket's state is going to
		* be {@link NetworkStats.Bucket#STATE_ALL}, all Bucket's metered is going to be
		* {@link NetworkStats.Bucket#METERED_ALL}, and all Bucket's roaming is going to be
		* {@link NetworkStats.Bucket#ROAMING_ALL}.
		* Therefore there can be multiple buckets for a particular key. However, all Buckets will have
		* {@code state} {@link NetworkStats.Bucket#STATE_ALL},
		* {@code defaultNetwork} {@link NetworkStats.Bucket#DEFAULT_NETWORK_ALL},
		* {@code metered } {@link NetworkStats.Bucket#METERED_ALL},
		* {@code roaming} {@link NetworkStats.Bucket#ROAMING_ALL}.
		* <p />
		* <b>NOTE:</b> Calling {@link #querySummaryForDevice} or accessing stats for apps other than the
		* calling app requires the permission {@link android.Manifest.permission#PACKAGE_USAGE_STATS},
		@@ -130,13 +131,26 @@ public class NetworkStatsManager {
		}
		}

		/** @hide */
		public Bucket querySummaryForDevice(NetworkTemplate template,
		long startTime, long endTime) throws SecurityException, RemoteException {
		Bucket bucket = null;
		NetworkStats stats = new NetworkStats(mContext, template, mFlags, startTime, endTime);
		bucket = stats.getDeviceSummaryForNetwork();

		stats.close();
		return bucket;
		}

		/**
		* Query network usage statistics summaries. Result is summarised data usage for the whole
		* device. Result is a single Bucket aggregated over time, state, uid, tag, metered, and
		* roaming. This means the bucket's start and end timestamp are going to be the same as the
		* 'startTime' and 'endTime' parameters. State is going to be
		* {@link NetworkStats.Bucket#STATE_ALL}, uid {@link NetworkStats.Bucket#UID_ALL},
		* tag {@link NetworkStats.Bucket#TAG_NONE}, metered {@link NetworkStats.Bucket#METERED_ALL},
		* tag {@link NetworkStats.Bucket#TAG_NONE},
		* default network {@link NetworkStats.Bucket#DEFAULT_NETWORK_ALL},
		* metered {@link NetworkStats.Bucket#METERED_ALL},
		* and roaming {@link NetworkStats.Bucket#ROAMING_ALL}.
		*
		* @param networkType As defined in {@link ConnectivityManager}, e.g.
		@@ -160,12 +174,7 @@ public class NetworkStatsManager {
		return null;
		}

		Bucket bucket = null;
		NetworkStats stats = new NetworkStats(mContext, template, mFlags, startTime, endTime);
		bucket = stats.getDeviceSummaryForNetwork();

		stats.close();
		return bucket;
		return querySummaryForDevice(template, startTime, endTime);
		}

		/**
		@@ -209,10 +218,10 @@ public class NetworkStatsManager {
		/**
		* Query network usage statistics summaries. Result filtered to include only uids belonging to
		* calling user. Result is aggregated over time, hence all buckets will have the same start and
		* end timestamps. Not aggregated over state, uid, metered, or roaming. This means buckets'
		* start and end timestamps are going to be the same as the 'startTime' and 'endTime'
		* parameters. State, uid, metered, and roaming are going to vary, and tag is going to be the
		* same.
		* end timestamps. Not aggregated over state, uid, default network, metered, or roaming. This
		* means buckets' start and end timestamps are going to be the same as the 'startTime' and
		* 'endTime' parameters. State, uid, metered, and roaming are going to vary, and tag is going to
		* be the same.
		*
		* @param networkType As defined in {@link ConnectivityManager}, e.g.
		* {@link ConnectivityManager#TYPE_MOBILE}, {@link ConnectivityManager#TYPE_WIFI}
		@@ -258,9 +267,10 @@ public class NetworkStatsManager {
		* belonging to calling user. Result is aggregated over state but not aggregated over time.
		* This means buckets' start and end timestamps are going to be between 'startTime' and
		* 'endTime' parameters. State is going to be {@link NetworkStats.Bucket#STATE_ALL}, uid the
		* same as the 'uid' parameter and tag the same as 'tag' parameter. metered is going to be
		* {@link NetworkStats.Bucket#METERED_ALL}, and roaming is going to be
		* {@link NetworkStats.Bucket#ROAMING_ALL}.
		* same as the 'uid' parameter and tag the same as 'tag' parameter.
		* defaultNetwork is going to be {@link NetworkStats.Bucket#DEFAULT_NETWORK_ALL},
		* metered is going to be {@link NetworkStats.Bucket#METERED_ALL}, and
		* roaming is going to be {@link NetworkStats.Bucket#ROAMING_ALL}.
		* <p>Only includes buckets that atomically occur in the inclusive time range. Doesn't
		* interpolate across partial buckets. Since bucket length is in the order of hours, this
		* method cannot be used to measure data usage on a fine grained time scale.
		@@ -301,9 +311,10 @@ public class NetworkStatsManager {
		* metered, nor roaming. This means buckets' start and end timestamps are going to be between
		* 'startTime' and 'endTime' parameters. State is going to be
		* {@link NetworkStats.Bucket#STATE_ALL}, uid will vary,
		* tag {@link NetworkStats.Bucket#TAG_NONE}, metered is going to be
		* {@link NetworkStats.Bucket#METERED_ALL}, and roaming is going to be
		* {@link NetworkStats.Bucket#ROAMING_ALL}.
		* tag {@link NetworkStats.Bucket#TAG_NONE},
		* default network is going to be {@link NetworkStats.Bucket#DEFAULT_NETWORK_ALL},
		* metered is going to be {@link NetworkStats.Bucket#METERED_ALL},
		* and roaming is going to be {@link NetworkStats.Bucket#ROAMING_ALL}.
		* <p>Only includes buckets that atomically occur in the inclusive time range. Doesn't
		* interpolate across partial buckets. Since bucket length is in the order of hours, this
		* method cannot be used to measure data usage on a fine grained time scale.
		@@ -335,6 +346,37 @@ public class NetworkStatsManager {
		return result;
		}

		/** @hide */
		public void registerUsageCallback(NetworkTemplate template, int networkType,
		long thresholdBytes, UsageCallback callback, @Nullable Handler handler) {
		checkNotNull(callback, "UsageCallback cannot be null");

		final Looper looper;
		if (handler == null) {
		looper = Looper.myLooper();
		} else {
		looper = handler.getLooper();
		}

		DataUsageRequest request = new DataUsageRequest(DataUsageRequest.REQUEST_ID_UNSET,
		template, thresholdBytes);
		try {
		CallbackHandler callbackHandler = new CallbackHandler(looper, networkType,
		template.getSubscriberId(), callback);
		callback.request = mService.registerUsageCallback(
		mContext.getOpPackageName(), request, new Messenger(callbackHandler),
		new Binder());
		if (DBG) Log.d(TAG, "registerUsageCallback returned " + callback.request);

		if (callback.request == null) {
		Log.e(TAG, "Request from callback is null; should not happen");
		}
		} catch (RemoteException e) {
		if (DBG) Log.d(TAG, "Remote exception when registering callback");
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Registers to receive notifications about data usage on specified networks.
		*
		@@ -363,15 +405,7 @@ public class NetworkStatsManager {
		*/
		public void registerUsageCallback(int networkType, String subscriberId, long thresholdBytes,
		UsageCallback callback, @Nullable Handler handler) {
		checkNotNull(callback, "UsageCallback cannot be null");

		final Looper looper;
		if (handler == null) {
		looper = Looper.myLooper();
		} else {
		looper = handler.getLooper();
		}

		NetworkTemplate template = createTemplate(networkType, subscriberId);
		if (DBG) {
		Log.d(TAG, "registerUsageCallback called with: {"
		+ " networkType=" + networkType
		@@ -379,25 +413,7 @@ public class NetworkStatsManager {
		+ " thresholdBytes=" + thresholdBytes
		+ " }");
		}

		NetworkTemplate template = createTemplate(networkType, subscriberId);
		DataUsageRequest request = new DataUsageRequest(DataUsageRequest.REQUEST_ID_UNSET,
		template, thresholdBytes);
		try {
		CallbackHandler callbackHandler = new CallbackHandler(looper, networkType,
		subscriberId, callback);
		callback.request = mService.registerUsageCallback(
		mContext.getOpPackageName(), request, new Messenger(callbackHandler),
		new Binder());
		if (DBG) Log.d(TAG, "registerUsageCallback returned " + callback.request);

		if (callback.request == null) {
		Log.e(TAG, "Request from callback is null; should not happen");
		}
		} catch (RemoteException e) {
		if (DBG) Log.d(TAG, "Remote exception when registering callback");
		throw e.rethrowFromSystemServer();
		}
		registerUsageCallback(template, networkType, thresholdBytes, callback, handler);
		}

		/**

core/java/android/net/NetworkIdentity.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
		proto.write(NetworkIdentityProto.NETWORK_ID, mNetworkId);
		proto.write(NetworkIdentityProto.ROAMING, mRoaming);
		proto.write(NetworkIdentityProto.METERED, mMetered);
		proto.write(NetworkIdentityProto.DEFAULT_NETWORK, mDefaultNetwork);

		proto.end(start);
		}

core/java/android/net/NetworkTemplate.java

+67 −2

Original line number	Diff line number	Diff line
		@@ -24,6 +24,15 @@ import static android.net.ConnectivityManager.TYPE_WIFI;
		import static android.net.ConnectivityManager.TYPE_WIFI_P2P;
		import static android.net.ConnectivityManager.TYPE_WIMAX;
		import static android.net.NetworkIdentity.COMBINE_SUBTYPE_ENABLED;
		import static android.net.NetworkStats.DEFAULT_NETWORK_ALL;
		import static android.net.NetworkStats.DEFAULT_NETWORK_NO;
		import static android.net.NetworkStats.DEFAULT_NETWORK_YES;
		import static android.net.NetworkStats.METERED_ALL;
		import static android.net.NetworkStats.METERED_NO;
		import static android.net.NetworkStats.METERED_YES;
		import static android.net.NetworkStats.ROAMING_ALL;
		import static android.net.NetworkStats.ROAMING_NO;
		import static android.net.NetworkStats.ROAMING_YES;
		import static android.net.wifi.WifiInfo.removeDoubleQuotes;
		import static android.telephony.TelephonyManager.NETWORK_CLASS_2_G;
		import static android.telephony.TelephonyManager.NETWORK_CLASS_3_G;
		@@ -191,16 +200,30 @@ public class NetworkTemplate implements Parcelable {

		private final String mNetworkId;

		// Matches for the NetworkStats constants METERED_, ROAMING_ and DEFAULT_NETWORK_*.
		private final int mMetered;
		private final int mRoaming;
		private final int mDefaultNetwork;

		public NetworkTemplate(int matchRule, String subscriberId, String networkId) {
		this(matchRule, subscriberId, new String[] { subscriberId }, networkId);
		}

		public NetworkTemplate(int matchRule, String subscriberId, String[] matchSubscriberIds,
		String networkId) {
		this(matchRule, subscriberId, matchSubscriberIds, networkId, METERED_ALL, ROAMING_ALL,
		DEFAULT_NETWORK_ALL);
		}

		public NetworkTemplate(int matchRule, String subscriberId, String[] matchSubscriberIds,
		String networkId, int metered, int roaming, int defaultNetwork) {
		mMatchRule = matchRule;
		mSubscriberId = subscriberId;
		mMatchSubscriberIds = matchSubscriberIds;
		mNetworkId = networkId;
		mMetered = metered;
		mRoaming = roaming;
		mDefaultNetwork = defaultNetwork;

		if (!isKnownMatchRule(matchRule)) {
		Log.e(TAG, "Unknown network template rule " + matchRule
		@@ -213,6 +236,9 @@ public class NetworkTemplate implements Parcelable {
		mSubscriberId = in.readString();
		mMatchSubscriberIds = in.createStringArray();
		mNetworkId = in.readString();
		mMetered = in.readInt();
		mRoaming = in.readInt();
		mDefaultNetwork = in.readInt();
		}

		@Override
		@@ -221,6 +247,9 @@ public class NetworkTemplate implements Parcelable {
		dest.writeString(mSubscriberId);
		dest.writeStringArray(mMatchSubscriberIds);
		dest.writeString(mNetworkId);
		dest.writeInt(mMetered);
		dest.writeInt(mRoaming);
		dest.writeInt(mDefaultNetwork);
		}

		@Override
		@@ -243,12 +272,23 @@ public class NetworkTemplate implements Parcelable {
		if (mNetworkId != null) {
		builder.append(", networkId=").append(mNetworkId);
		}
		if (mMetered != METERED_ALL) {
		builder.append(", metered=").append(NetworkStats.meteredToString(mMetered));
		}
		if (mRoaming != ROAMING_ALL) {
		builder.append(", roaming=").append(NetworkStats.roamingToString(mRoaming));
		}
		if (mDefaultNetwork != DEFAULT_NETWORK_ALL) {
		builder.append(", defaultNetwork=").append(NetworkStats.defaultNetworkToString(
		mDefaultNetwork));
		}
		return builder.toString();
		}

		@Override
		public int hashCode() {
		return Objects.hash(mMatchRule, mSubscriberId, mNetworkId);
		return Objects.hash(mMatchRule, mSubscriberId, mNetworkId, mMetered, mRoaming,
		mDefaultNetwork);
		}

		@Override
		@@ -257,7 +297,10 @@ public class NetworkTemplate implements Parcelable {
		final NetworkTemplate other = (NetworkTemplate) obj;
		return mMatchRule == other.mMatchRule
		&& Objects.equals(mSubscriberId, other.mSubscriberId)
		&& Objects.equals(mNetworkId, other.mNetworkId);
		&& Objects.equals(mNetworkId, other.mNetworkId)
		&& mMetered == other.mMetered
		&& mRoaming == other.mRoaming
		&& mDefaultNetwork == other.mDefaultNetwork;
		}
		return false;
		}
		@@ -300,6 +343,10 @@ public class NetworkTemplate implements Parcelable {
		* Test if given {@link NetworkIdentity} matches this template.
		*/
		public boolean matches(NetworkIdentity ident) {
		if (!matchesMetered(ident)) return false;
		if (!matchesRoaming(ident)) return false;
		if (!matchesDefaultNetwork(ident)) return false;

		switch (mMatchRule) {
		case MATCH_MOBILE_ALL:
		return matchesMobile(ident);
		@@ -326,6 +373,24 @@ public class NetworkTemplate implements Parcelable {
		}
		}

		private boolean matchesMetered(NetworkIdentity ident) {
		return (mMetered == METERED_ALL)
		\|\| (mMetered == METERED_YES && ident.mMetered)
		\|\| (mMetered == METERED_NO && !ident.mMetered);
		}

		private boolean matchesRoaming(NetworkIdentity ident) {
		return (mRoaming == ROAMING_ALL)
		\|\| (mRoaming == ROAMING_YES && ident.mRoaming)
		\|\| (mRoaming == ROAMING_NO && !ident.mRoaming);
		}

		private boolean matchesDefaultNetwork(NetworkIdentity ident) {
		return (mDefaultNetwork == DEFAULT_NETWORK_ALL)
		\|\| (mDefaultNetwork == DEFAULT_NETWORK_YES && ident.mDefaultNetwork)
		\|\| (mDefaultNetwork == DEFAULT_NETWORK_NO && !ident.mDefaultNetwork);
		}

		public boolean matchesSubscriberId(String subscriberId) {
		return ArrayUtils.contains(mMatchSubscriberIds, subscriberId);
		}