Merge "Roaming always metered, relax DHCP metered check." into jb-dev

Author: jsharkey

core/java/android/net/DhcpInfoInternal.java

@@ -147,7 +147,11 @@ public void updateFromDhcpRequest(DhcpInfoInternal orig) {
      * metered, and sensitive to heavy data transfers.
      */
     public boolean hasMeteredHint() {
-        return "ANDROID_METERED".equals(vendorInfo);
+        if (vendorInfo != null) {
+            return vendorInfo.contains("ANDROID_METERED");
+        } else {
+            return false;
+        }
     }
 
     public String toString() {

services/java/com/android/server/net/NetworkPolicyManagerService.java

@@ -1497,6 +1497,11 @@ private NetworkQuotaInfo getNetworkQuotaInfoUnchecked(NetworkState state) {
     public boolean isNetworkMetered(NetworkState state) {
         final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state);
 
+        // roaming networks are always considered metered
+        if (ident.getRoaming()) {
+            return true;
+        }
+
         final NetworkPolicy policy;
         synchronized (mRulesLock) {
             policy = findPolicyForNetworkLocked(ident);