Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524

This reverts commit bde7bc45af. Change-Id: I1a0bcd1c2e0d4ade7efa980edd2105408bb48991
2015-01-09 17:45:40 +00:00
parent bde7bc45af
commit 2999acb0ce
1 changed files with 3 additions and 2 deletions
--- a/services/core/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/core/java/com/android/server/location/GpsLocationProvider.java
@@ -788,8 +788,9 @@ public class GpsLocationProvider implements LocationProviderInterface {
        }

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