From 7c91446769fcfc4cb8bc93368bbfe5f88c624862 Mon Sep 17 00:00:00 2001 From: Bryce Lee Date: Thu, 8 Jan 2015 02:32:08 +0000 Subject: Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." This reverts commit fabbdf7204474a9f789ce441219b3b9f3df66bb8. Causes NPE on devices without telephony (Android Wear for example) Bug:18922524 Change-Id: I3be4187a20da11fd5a302dd88e808a68cd7e5737 --- .../core/java/com/android/server/location/GpsLocationProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GpsLocationProvider.java index 806253a38b7a..9c0f9874b5bc 100644 --- a/services/core/java/com/android/server/location/GpsLocationProvider.java +++ b/services/core/java/com/android/server/location/GpsLocationProvider.java @@ -788,7 +788,9 @@ public class GpsLocationProvider implements LocationProviderInterface { } if (info != null) { - boolean dataEnabled = TelephonyManager.getDefault().getDataEnabled(); + 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) { -- cgit v1.2.3-59-g8ed1b