GpsLocationProvider: Read data enabled status from TelephonyManager.

Bug: 18814559 Change-Id: Ie8edde652565aca2e2a1935ed42eb927b7d26baa
2015-01-08 16:04:24 -08:00
parent 2cc617b2ad
commit bde7bc45af
1 changed files with 2 additions and 3 deletions
--- a/services/core/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/core/java/com/android/server/location/GpsLocationProvider.java
@@ -788,9 +788,8 @@ public class GpsLocationProvider implements LocationProviderInterface {
        }

        if (info != null) {
-            boolean dataEnabled = TelephonyManager.getIntWithSubId(mContext.getContentResolver(),
-                    Settings.Global.MOBILE_DATA, SubscriptionManager.getDefaultSubId(),
-                    1) == 1;
+            boolean dataEnabled = TelephonyManager.getDefault() != null ?
+                TelephonyManager.getDefault().getDataEnabled() : true;
            boolean networkAvailable = info.isAvailable() && dataEnabled;
            String defaultApn = getSelectedApn();
            if (defaultApn == null) {