commit 502216870f6408eed67999c060df72ef9657ca67
author Shishir Agrawal <shishir@google.com> Tue Jan 06 14:35:31 2015 -0800
committer The Android Automerger <android-build@google.com> Wed Jan 07 12:22:58 2015 -0800
tree b7237016638c3a5f3752a512e293242b83c0761a
parent a016f20c4e43f1d40ec6867c19b6819a180eb127

GpsLocationProvider: Read data enabled status from TelephonyManager.

Bug: 18814559
Change-Id: I1488bd763d95d5ad087bc4ceb5f4c3767c05b62f

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) {