From 8af88fb8387259e51615709b2d1ea0260f7057fd Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Wed, 31 Aug 2011 11:17:47 -0700 Subject: Use the new isNetworkSupported api for wifi-only Didn't have an API for this before so people used a hacked system property (ro.carrier) to determine if the device supported mobile data. Added new API and switching callsites. bug:5087537 Change-Id: Ibd799559be102a9e2fd552d1a23d1afbcf8f4614 --- src/com/android/settings/Utils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/com/android/settings/Utils.java') diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 73a9a30b0..2d2b6548c 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -290,8 +290,10 @@ public class Utils { return telephony != null && telephony.isVoiceCapable(); } - public static boolean isWifiOnly() { - return "wifi-only".equals(SystemProperties.get("ro.carrier")); + public static boolean isWifiOnly(Context context) { + ConnectivityManager cm = (ConnectivityManager)context.getSystemService( + Context.CONNECTIVITY_SERVICE); + return (cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE) == false); } /** -- cgit v1.2.3