From bde7bc45af2bb7f9bee8096d45973f25cc00c5db Mon Sep 17 00:00:00 2001
From: Shishir Agrawal <shishir@google.com>
Date: Thu, 8 Jan 2015 16:04:24 -0800
Subject: GpsLocationProvider: Read data enabled status from TelephonyManager.

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

diff --git a/services/core/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GpsLocationProvider.java
index 9c0f9874b5bc..a3ad914ef7b1 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 @@ public class GpsLocationProvider implements LocationProviderInterface {
         }
 
         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) {
-- 
cgit v1.2.3-59-g8ed1b