diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-04-30 17:06:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-30 17:06:09 -0700 |
| commit | 4c3de54daa4ba0dadefc6eae9beb84c15da8d867 (patch) | |
| tree | 26886f99dbff11265cc54e9b749cf7a5bf2a5271 /core/java | |
| parent | faac92942c50b12edada5e92e7c323609b2bdb5f (diff) | |
| parent | f166f480f0f29b310a27fe001ee26d7dfac84fdd (diff) | |
Merge "Roaming always metered, relax DHCP metered check." into jb-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/DhcpInfoInternal.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/net/DhcpInfoInternal.java b/core/java/android/net/DhcpInfoInternal.java index c87c34b8b12a..f3508c1105bb 100644 --- a/core/java/android/net/DhcpInfoInternal.java +++ b/core/java/android/net/DhcpInfoInternal.java @@ -147,7 +147,11 @@ public class DhcpInfoInternal { * 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() { |