Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev

2015-01-07 00:12:15 +00:00
parent 8d46f934ca fabbdf7204
commit 5a21b0c2d0
1 changed files with 1 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,7 @@ 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().getDataEnabled();
            boolean networkAvailable = info.isAvailable() && dataEnabled;
            String defaultApn = getSelectedApn();
            if (defaultApn == null) {