From 9f6e4ba50e7e73704c7fbd3ba65fe73bdf8ad73f Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 19 Apr 2012 23:01:08 -0700 Subject: Connect metered DHCP hint for Wi-Fi networks. When DHCP lease includes vendor info indicating that remote Wi-Fi network is metered, advise NetworkPolicy. Users can still manually change the metered flag in Settings. Also remove any policies belonging to removed Wi-Fi networks, and teach isNetworkMetered() about ethernet networks. Bug: 6344821, 6369307, 6365872 Change-Id: I108606c6fddf2d02828fcab011f3a1501415f1bc --- core/java/android/net/DhcpInfoInternal.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'core/java/android') diff --git a/core/java/android/net/DhcpInfoInternal.java b/core/java/android/net/DhcpInfoInternal.java index 7ab8047..c87c34b 100644 --- a/core/java/android/net/DhcpInfoInternal.java +++ b/core/java/android/net/DhcpInfoInternal.java @@ -142,6 +142,14 @@ public class DhcpInfoInternal { } } + /** + * Test if this DHCP lease includes vendor hint that network link is + * metered, and sensitive to heavy data transfers. + */ + public boolean hasMeteredHint() { + return "ANDROID_METERED".equals(vendorInfo); + } + public String toString() { String routeString = ""; for (RouteInfo route : mRoutes) routeString += route.toString() + " | "; -- cgit v1.1