commit 4a207e3e52044839b035c2a0af9c240d31692422
author Ariel Gertzenstein <agertzen@google.com> Fri Jan 09 18:03:03 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 09 18:03:03 2015 +0000
tree 7620c40d27c997130008e8a78e0229fab4223f40
parent e24637e641ec1f39455f270a4d6050c4d0383515
parent b32831eebfd3c3ba2b26da18fef6818c12643f9d

Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev automerge: cce8db2
automerge: b32831e

* commit 'b32831eebfd3c3ba2b26da18fef6818c12643f9d':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524

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 2231ef0..b46a450 100644
--- a/services/core/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/core/java/com/android/server/location/GpsLocationProvider.java
@@ -788,8 +788,9 @@
         }
 
         if (info != null) {
-            boolean dataEnabled = TelephonyManager.getDefault() != null ?
-                TelephonyManager.getDefault().getDataEnabled() : true;
+            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) {