commit d0173277b20b69c73ad0bc4bf4f17c8d900d4097
author Shishir Agrawal <shishir@google.com> Wed Jan 07 00:16:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 07 00:16:56 2015 +0000
tree 6d393fb73ded32ecbae3ef3c334192f67fc46813
parent c2112a75983cce62ed493ec0feafbb2c27ad76b4
parent 5a21b0c2d0fca36fbbfb32641002ad4122c6b128

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

* commit '5a21b0c2d0fca36fbbfb32641002ad4122c6b128':
  GpsLocationProvider: Read data enabled status from TelephonyManager.

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