LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support metered Wi-Fi NetworkPolicy.

Browse Source 
Add networkId field to NetworkIdentity to identify Wi-Fi networks by
SSID.  Add support for policies without usage cycles.

Only apply mobile policies when SIM state is ready, which is cleaner
than just checking for airplane mode.  Also avoids creating no-op
default policies when subscriberId is null.

Bug: 3001465, 3291052
Change-Id: I1f8aaa49a5db306df022c402ea7f3f5d4bc0cfc7
This commit is contained in:
Jeff Sharkey
2012-04-04 20:40:58 -07:00
parent f3f68819df
commit 3bd888f411
5 changed files with 139 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
core/java/android/net/NetworkIdentity.java
View File

@@ -16,9 +16,13 @@
package android.net; package android.net;
import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.ConnectivityManager.getNetworkTypeName;
import static android.net.ConnectivityManager.isNetworkTypeMobile; import static android.net.ConnectivityManager.isNetworkTypeMobile;
import android.content.Context; import android.content.Context;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Build; import android.os.Build;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
@@ -42,18 +46,21 @@ public class NetworkIdentity {
final int mType; final int mType;
final int mSubType; final int mSubType;
final String mSubscriberId; final String mSubscriberId;
final String mNetworkId;
final boolean mRoaming; final boolean mRoaming;
public NetworkIdentity(int type, int subType, String subscriberId, boolean roaming) { public NetworkIdentity(
this.mType = type; int type, int subType, String subscriberId, String networkId, boolean roaming) {
this.mSubType = COMBINE_SUBTYPE_ENABLED ? SUBTYPE_COMBINED : subType; mType = type;
this.mSubscriberId = subscriberId; mSubType = COMBINE_SUBTYPE_ENABLED ? SUBTYPE_COMBINED : subType;
this.mRoaming = roaming; mSubscriberId = subscriberId;
mNetworkId = networkId;
mRoaming = roaming;
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hashCode(mType, mSubType, mSubscriberId, mRoaming); return Objects.hashCode(mType, mSubType, mSubscriberId, mNetworkId, mRoaming);
} }
@Override @Override
@@ -61,27 +68,34 @@ public class NetworkIdentity {
if (obj instanceof NetworkIdentity) { if (obj instanceof NetworkIdentity) {
final NetworkIdentity ident = (NetworkIdentity) obj; final NetworkIdentity ident = (NetworkIdentity) obj;
return mType == ident.mType && mSubType == ident.mSubType && mRoaming == ident.mRoaming return mType == ident.mType && mSubType == ident.mSubType && mRoaming == ident.mRoaming
&& Objects.equal(mSubscriberId, ident.mSubscriberId); && Objects.equal(mSubscriberId, ident.mSubscriberId)
&& Objects.equal(mNetworkId, ident.mNetworkId);
} }
return false; return false;
} }
@Override @Override
public String toString() { public String toString() {
final String typeName = ConnectivityManager.getNetworkTypeName(mType); final StringBuilder builder = new StringBuilder("[");
final String subTypeName; builder.append("type=").append(getNetworkTypeName(mType));
builder.append(", subType=");
if (COMBINE_SUBTYPE_ENABLED) { if (COMBINE_SUBTYPE_ENABLED) {
subTypeName = "COMBINED"; builder.append("COMBINED");
} else if (ConnectivityManager.isNetworkTypeMobile(mType)) { } else if (ConnectivityManager.isNetworkTypeMobile(mType)) {
subTypeName = TelephonyManager.getNetworkTypeName(mSubType); builder.append(TelephonyManager.getNetworkTypeName(mSubType));
} else { } else {
subTypeName = Integer.toString(mSubType); builder.append(mSubType);
} }
if (mSubscriberId != null) {
final String scrubSubscriberId = scrubSubscriberId(mSubscriberId); builder.append(", subscriberId=").append(scrubSubscriberId(mSubscriberId));
final String roaming = mRoaming ? ", ROAMING" : ""; }
return "[type=" + typeName + ", subType=" + subTypeName + ", subscriberId=" if (mNetworkId != null) {
+ scrubSubscriberId + roaming + "]"; builder.append(", networkId=").append(mNetworkId);
}
if (mRoaming) {
builder.append(", ROAMING");
}
return builder.append("]").toString();
} }
public int getType() { public int getType() {
@@ -96,6 +110,10 @@ public class NetworkIdentity {
return mSubscriberId; return mSubscriberId;
} }
public String getNetworkId() {
return mNetworkId;
}
public boolean getRoaming() { public boolean getRoaming() {
return mRoaming; return mRoaming;
} }
@@ -106,8 +124,11 @@ public class NetworkIdentity {
public static String scrubSubscriberId(String subscriberId) { public static String scrubSubscriberId(String subscriberId) {
if ("eng".equals(Build.TYPE)) { if ("eng".equals(Build.TYPE)) {
return subscriberId; return subscriberId;
} else if (subscriberId != null) {
// TODO: parse this as MCC+MNC instead of hard-coding
return subscriberId.substring(0, Math.min(6, subscriberId.length())) + "...";
} else { } else {
return subscriberId != null ? "valid" : "null"; return "null";
} }
} }
@@ -122,8 +143,10 @@ public class NetworkIdentity {
// TODO: consider moving subscriberId over to LinkCapabilities, so it // TODO: consider moving subscriberId over to LinkCapabilities, so it
// comes from an authoritative source. // comes from an authoritative source.
final String subscriberId; String subscriberId = null;
final boolean roaming; String networkId = null;
boolean roaming = false;
if (isNetworkTypeMobile(type)) { if (isNetworkTypeMobile(type)) {
final TelephonyManager telephony = (TelephonyManager) context.getSystemService( final TelephonyManager telephony = (TelephonyManager) context.getSystemService(
Context.TELEPHONY_SERVICE); Context.TELEPHONY_SERVICE);
@@ -133,10 +156,13 @@ public class NetworkIdentity {
} else { } else {
subscriberId = telephony.getSubscriberId(); subscriberId = telephony.getSubscriberId();
} }
} else {
subscriberId = null; } else if (type == TYPE_WIFI) {
roaming = false; final WifiManager wifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
final WifiInfo info = wifi.getConnectionInfo();
networkId = info != null ? info.getSSID() : null;
} }
return new NetworkIdentity(type, subType, subscriberId, roaming);
return new NetworkIdentity(type, subType, subscriberId, networkId, roaming);
} }
} }

95
core/java/android/net/NetworkTemplate.java
View File

@@ -43,15 +43,10 @@ import com.android.internal.util.Objects;
*/ */
public class NetworkTemplate implements Parcelable { public class NetworkTemplate implements Parcelable {
/** {@hide} */
public static final int MATCH_MOBILE_ALL = 1; public static final int MATCH_MOBILE_ALL = 1;
/** {@hide} */
public static final int MATCH_MOBILE_3G_LOWER = 2; public static final int MATCH_MOBILE_3G_LOWER = 2;
/** {@hide} */
public static final int MATCH_MOBILE_4G = 3; public static final int MATCH_MOBILE_4G = 3;
/** {@hide} */
public static final int MATCH_WIFI = 4; public static final int MATCH_WIFI = 4;
/** {@hide} */
public static final int MATCH_ETHERNET = 5; public static final int MATCH_ETHERNET = 5;
/** /**
@@ -65,37 +60,50 @@ public class NetworkTemplate implements Parcelable {
} }
/** /**
* Template to combine all {@link ConnectivityManager#TYPE_MOBILE} style * Template to match {@link ConnectivityManager#TYPE_MOBILE} networks with
* networks together. Only uses statistics for requested IMSI. * the given IMSI.
*/ */
public static NetworkTemplate buildTemplateMobileAll(String subscriberId) { public static NetworkTemplate buildTemplateMobileAll(String subscriberId) {
return new NetworkTemplate(MATCH_MOBILE_ALL, subscriberId); return new NetworkTemplate(MATCH_MOBILE_ALL, subscriberId, null);
} }
/** /**
* Template to combine all {@link ConnectivityManager#TYPE_MOBILE} style * Template to match {@link ConnectivityManager#TYPE_MOBILE} networks with
* networks together that roughly meet a "3G" definition, or lower. Only * the given IMSI that roughly meet a "3G" definition, or lower.
* uses statistics for requested IMSI.
*/ */
@Deprecated
public static NetworkTemplate buildTemplateMobile3gLower(String subscriberId) { public static NetworkTemplate buildTemplateMobile3gLower(String subscriberId) {
return new NetworkTemplate(MATCH_MOBILE_3G_LOWER, subscriberId); return new NetworkTemplate(MATCH_MOBILE_3G_LOWER, subscriberId, null);
} }
/** /**
* Template to combine all {@link ConnectivityManager#TYPE_MOBILE} style * Template to match {@link ConnectivityManager#TYPE_MOBILE} networks with
* networks together that meet a "4G" definition. Only uses statistics for * the given IMSI that roughly meet a "4G" definition.
* requested IMSI.
*/ */
@Deprecated
public static NetworkTemplate buildTemplateMobile4g(String subscriberId) { public static NetworkTemplate buildTemplateMobile4g(String subscriberId) {
return new NetworkTemplate(MATCH_MOBILE_4G, subscriberId); return new NetworkTemplate(MATCH_MOBILE_4G, subscriberId, null);
} }
/** /**
* Template to combine all {@link ConnectivityManager#TYPE_WIFI} style * Template to match all {@link ConnectivityManager#TYPE_WIFI} networks,
* networks together. * regardless of SSID.
*/ */
public static NetworkTemplate buildTemplateWifiWildcard() {
return new NetworkTemplate(MATCH_WIFI, null, null);
}
@Deprecated
public static NetworkTemplate buildTemplateWifi() { public static NetworkTemplate buildTemplateWifi() {
return new NetworkTemplate(MATCH_WIFI, null); return buildTemplateWifiWildcard();
}
/**
* Template to match {@link ConnectivityManager#TYPE_WIFI} networks with the
* given SSID.
*/
public static NetworkTemplate buildTemplateWifi(String networkId) {
return new NetworkTemplate(MATCH_WIFI, null, networkId);
} }
/** /**
@@ -103,44 +111,53 @@ public class NetworkTemplate implements Parcelable {
* networks together. * networks together.
*/ */
public static NetworkTemplate buildTemplateEthernet() { public static NetworkTemplate buildTemplateEthernet() {
return new NetworkTemplate(MATCH_ETHERNET, null); return new NetworkTemplate(MATCH_ETHERNET, null, null);
} }
private final int mMatchRule; private final int mMatchRule;
private final String mSubscriberId; private final String mSubscriberId;
private final String mNetworkId;
/** {@hide} */ public NetworkTemplate(int matchRule, String subscriberId, String networkId) {
public NetworkTemplate(int matchRule, String subscriberId) { mMatchRule = matchRule;
this.mMatchRule = matchRule; mSubscriberId = subscriberId;
this.mSubscriberId = subscriberId; mNetworkId = networkId;
} }
private NetworkTemplate(Parcel in) { private NetworkTemplate(Parcel in) {
mMatchRule = in.readInt(); mMatchRule = in.readInt();
mSubscriberId = in.readString(); mSubscriberId = in.readString();
mNetworkId = in.readString();
} }
/** {@inheritDoc} */ @Override
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(mMatchRule); dest.writeInt(mMatchRule);
dest.writeString(mSubscriberId); dest.writeString(mSubscriberId);
dest.writeString(mNetworkId);
} }
/** {@inheritDoc} */ @Override
public int describeContents() { public int describeContents() {
return 0; return 0;
} }
@Override @Override
public String toString() { public String toString() {
final String scrubSubscriberId = scrubSubscriberId(mSubscriberId); final StringBuilder builder = new StringBuilder("NetworkTemplate: ");
return "NetworkTemplate: matchRule=" + getMatchRuleName(mMatchRule) + ", subscriberId=" builder.append("matchRule=").append(getMatchRuleName(mMatchRule));
+ scrubSubscriberId; if (mSubscriberId != null) {
builder.append(", subscriberId=").append(scrubSubscriberId(mSubscriberId));
}
if (mNetworkId != null) {
builder.append(", networkId=").append(mNetworkId);
}
return builder.toString();
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hashCode(mMatchRule, mSubscriberId); return Objects.hashCode(mMatchRule, mSubscriberId, mNetworkId);
} }
@Override @Override
@@ -148,21 +165,24 @@ public class NetworkTemplate implements Parcelable {
if (obj instanceof NetworkTemplate) { if (obj instanceof NetworkTemplate) {
final NetworkTemplate other = (NetworkTemplate) obj; final NetworkTemplate other = (NetworkTemplate) obj;
return mMatchRule == other.mMatchRule return mMatchRule == other.mMatchRule
&& Objects.equal(mSubscriberId, other.mSubscriberId); && Objects.equal(mSubscriberId, other.mSubscriberId)
&& Objects.equal(mNetworkId, other.mNetworkId);
} }
return false; return false;
} }
/** {@hide} */
public int getMatchRule() { public int getMatchRule() {
return mMatchRule; return mMatchRule;
} }
/** {@hide} */
public String getSubscriberId() { public String getSubscriberId() {
return mSubscriberId; return mSubscriberId;
} }
public String getNetworkId() {
return mNetworkId;
}
/** /**
* Test if given {@link NetworkIdentity} matches this template. * Test if given {@link NetworkIdentity} matches this template.
*/ */
@@ -237,8 +257,13 @@ public class NetworkTemplate implements Parcelable {
private boolean matchesWifi(NetworkIdentity ident) { private boolean matchesWifi(NetworkIdentity ident) {
switch (ident.mType) { switch (ident.mType) {
case TYPE_WIFI: case TYPE_WIFI:
if (mNetworkId == null) {
return true;
} else {
return Objects.equal(mNetworkId, ident.mNetworkId);
}
case TYPE_WIFI_P2P: case TYPE_WIFI_P2P:
return true; return mNetworkId == null;
default: default:
return false; return false;
} }
@@ -279,10 +304,12 @@ public class NetworkTemplate implements Parcelable {
} }
public static final Creator<NetworkTemplate> CREATOR = new Creator<NetworkTemplate>() { public static final Creator<NetworkTemplate> CREATOR = new Creator<NetworkTemplate>() {
@Override
public NetworkTemplate createFromParcel(Parcel in) { public NetworkTemplate createFromParcel(Parcel in) {
return new NetworkTemplate(in); return new NetworkTemplate(in);
} }
@Override
public NetworkTemplate[] newArray(int size) { public NetworkTemplate[] newArray(int size) {
return new NetworkTemplate[size]; return new NetworkTemplate[size];
} }

8
core/java/com/android/internal/net/NetworkStatsFactory.java
View File

@@ -16,7 +16,7 @@
package com.android.internal.net; package com.android.internal.net;
import static android.net.NetworkStats.SET_DEFAULT; import static android.net.NetworkStats.SET_ALL;
import static android.net.NetworkStats.TAG_NONE; import static android.net.NetworkStats.TAG_NONE;
import static android.net.NetworkStats.UID_ALL; import static android.net.NetworkStats.UID_ALL;
import static com.android.server.NetworkManagementSocketTagger.kernelToTag; import static com.android.server.NetworkManagementSocketTagger.kernelToTag;
@@ -101,7 +101,7 @@ public class NetworkStatsFactory {
while (reader.hasMoreData()) { while (reader.hasMoreData()) {
entry.iface = reader.nextString(); entry.iface = reader.nextString();
entry.uid = UID_ALL; entry.uid = UID_ALL;
entry.set = SET_DEFAULT; entry.set = SET_ALL;
entry.tag = TAG_NONE; entry.tag = TAG_NONE;
final boolean active = reader.nextInt() != 0; final boolean active = reader.nextInt() != 0;
@@ -165,7 +165,7 @@ public class NetworkStatsFactory {
entry.iface = iface; entry.iface = iface;
entry.uid = UID_ALL; entry.uid = UID_ALL;
entry.set = SET_DEFAULT; entry.set = SET_ALL;
entry.tag = TAG_NONE; entry.tag = TAG_NONE;
entry.rxBytes = readSingleLongFromFile(new File(ifacePath, "rx_bytes")); entry.rxBytes = readSingleLongFromFile(new File(ifacePath, "rx_bytes"));
entry.rxPackets = readSingleLongFromFile(new File(ifacePath, "rx_packets")); entry.rxPackets = readSingleLongFromFile(new File(ifacePath, "rx_packets"));
@@ -193,7 +193,7 @@ public class NetworkStatsFactory {
try { try {
entry.iface = values.get(0); entry.iface = values.get(0);
entry.uid = UID_ALL; entry.uid = UID_ALL;
entry.set = SET_DEFAULT; entry.set = SET_ALL;
entry.tag = TAG_NONE; entry.tag = TAG_NONE;
entry.rxBytes = Long.parseLong(values.get(1)); entry.rxBytes = Long.parseLong(values.get(1));
entry.rxPackets = Long.parseLong(values.get(2)); entry.rxPackets = Long.parseLong(values.get(2));

47
services/java/com/android/server/net/NetworkIdentitySet.java
View File

@@ -21,7 +21,6 @@ import android.net.NetworkIdentity;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.ProtocolException;
import java.util.HashSet; import java.util.HashSet;
/** /**
@@ -33,48 +32,46 @@ import java.util.HashSet;
public class NetworkIdentitySet extends HashSet<NetworkIdentity> { public class NetworkIdentitySet extends HashSet<NetworkIdentity> {
private static final int VERSION_INIT = 1; private static final int VERSION_INIT = 1;
private static final int VERSION_ADD_ROAMING = 2; private static final int VERSION_ADD_ROAMING = 2;
private static final int VERSION_ADD_NETWORK_ID = 3;
public NetworkIdentitySet() { public NetworkIdentitySet() {
} }
public NetworkIdentitySet(DataInputStream in) throws IOException { public NetworkIdentitySet(DataInputStream in) throws IOException {
final int version = in.readInt(); final int version = in.readInt();
switch (version) { final int size = in.readInt();
case VERSION_INIT: { for (int i = 0; i < size; i++) {
final int size = in.readInt(); if (version <= VERSION_INIT) {
for (int i = 0; i < size; i++) { final int ignored = in.readInt();
final int ignoredVersion = in.readInt();
final int type = in.readInt();
final int subType = in.readInt();
final String subscriberId = readOptionalString(in);
add(new NetworkIdentity(type, subType, subscriberId, false));
}
break;
} }
case VERSION_ADD_ROAMING: { final int type = in.readInt();
final int size = in.readInt(); final int subType = in.readInt();
for (int i = 0; i < size; i++) { final String subscriberId = readOptionalString(in);
final int type = in.readInt(); final String networkId;
final int subType = in.readInt(); if (version >= VERSION_ADD_NETWORK_ID) {
final String subscriberId = readOptionalString(in); networkId = readOptionalString(in);
final boolean roaming = in.readBoolean(); } else {
add(new NetworkIdentity(type, subType, subscriberId, roaming)); networkId = null;
}
break;
} }
default: { final boolean roaming;
throw new ProtocolException("unexpected version: " + version); if (version >= VERSION_ADD_ROAMING) {
roaming = in.readBoolean();
} else {
roaming = false;
} }
add(new NetworkIdentity(type, subType, subscriberId, networkId, false));
} }
} }
public void writeToStream(DataOutputStream out) throws IOException { public void writeToStream(DataOutputStream out) throws IOException {
out.writeInt(VERSION_ADD_ROAMING); out.writeInt(VERSION_ADD_NETWORK_ID);
out.writeInt(size()); out.writeInt(size());
for (NetworkIdentity ident : this) { for (NetworkIdentity ident : this) {
out.writeInt(ident.getType()); out.writeInt(ident.getType());
out.writeInt(ident.getSubType()); out.writeInt(ident.getSubType());
writeOptionalString(out, ident.getSubscriberId()); writeOptionalString(out, ident.getSubscriberId());
writeOptionalString(out, ident.getNetworkId());
out.writeBoolean(ident.getRoaming()); out.writeBoolean(ident.getRoaming());
} }
} }

4
services/java/com/android/server/net/NetworkStatsService.java
View File

@@ -34,7 +34,7 @@ import static android.net.NetworkStats.SET_FOREGROUND;
import static android.net.NetworkStats.TAG_NONE; import static android.net.NetworkStats.TAG_NONE;
import static android.net.NetworkStats.UID_ALL; import static android.net.NetworkStats.UID_ALL;
import static android.net.NetworkTemplate.buildTemplateMobileAll; import static android.net.NetworkTemplate.buildTemplateMobileAll;
import static android.net.NetworkTemplate.buildTemplateWifi; import static android.net.NetworkTemplate.buildTemplateWifiWildcard;
import static android.net.TrafficStats.MB_IN_BYTES; import static android.net.TrafficStats.MB_IN_BYTES;
import static android.provider.Settings.Secure.NETSTATS_DEV_BUCKET_DURATION; import static android.provider.Settings.Secure.NETSTATS_DEV_BUCKET_DURATION;
import static android.provider.Settings.Secure.NETSTATS_DEV_DELETE_AGE; import static android.provider.Settings.Secure.NETSTATS_DEV_DELETE_AGE;
@@ -836,7 +836,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
trustedTime); trustedTime);
// collect wifi sample // collect wifi sample
template = buildTemplateWifi(); template = buildTemplateWifiWildcard();
devTotal = mDevRecorder.getTotalSinceBootLocked(template); devTotal = mDevRecorder.getTotalSinceBootLocked(template);
xtTotal = new NetworkStats.Entry(); xtTotal = new NetworkStats.Entry();
uidTotal = mUidRecorder.getTotalSinceBootLocked(template); uidTotal = mUidRecorder.getTotalSinceBootLocked(template);