From 2999acb0ce6c677ac5355abad1b322befb58b7da Mon Sep 17 00:00:00 2001
From: Ariel Gertzenstein <agertzen@google.com>
Date: Fri, 9 Jan 2015 17:45:40 +0000
Subject: [PATCH] Revert "GpsLocationProvider: Read data enabled status from
 TelephonyManager." as it reintroduces b/18922524

This reverts commit bde7bc45af2bb7f9bee8096d45973f25cc00c5db.

Change-Id: I1a0bcd1c2e0d4ade7efa980edd2105408bb48991
---
 .../com/android/server/location/GpsLocationProvider.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GpsLocationProvider.java
index a3ad914ef7b1f..9c0f9874b5bc1 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 @@ public class GpsLocationProvider implements LocationProviderInterface {
         }
 
         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) {