commit bde7bc45af2bb7f9bee8096d45973f25cc00c5db
author Shishir Agrawal <shishir@google.com> Thu Jan 08 16:04:24 2015 -0800
committer Shishir Agrawal <shishir@google.com> Thu Jan 08 16:04:24 2015 -0800
tree a217aaeeb49496fc82a09d39ed04a600acda6ea7
parent 2cc617b2adcd3c54837a251b688e909e3224a5e4

GpsLocationProvider: Read data enabled status from TelephonyManager.

Bug: 18814559
Change-Id: Ie8edde652565aca2e2a1935ed42eb927b7d26baa

services/core/java/com/android/server/location/GpsLocationProvider.java

diff --git a/services/core/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GpsLocationProvider.java
index 9c0f987..a3ad914 100644
--- a/services/core/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/core/java/com/android/server/location/GpsLocationProvider.java
@@ -788,9 +788,8 @@
         }
 
         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) {