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

2015-01-08 04:30:12 +00:00
parent 09d4e03736 7c91446769
commit c010c96fdf
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/core/java/com/android/server/location/GpsLocationProvider.java
@@ -788,7 +788,9 @@ public class GpsLocationProvider implements LocationProviderInterface {
        }

        if (info != null) {
-            boolean dataEnabled = TelephonyManager.getDefault().getDataEnabled();
+            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) {