diff options
author | Shishir Agrawal <shishir@google.com> | 2015-02-11 03:38:07 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 03:38:07 +0000 |
commit | 438a92cd068e72c66b8ae2d4582e363032c6a7ba (patch) | |
tree | 0a058e740f9882027981c64bd7b92cd2a489e41c /services | |
parent | 3c817c6af02490dfb78ece66a56a41bf3873607c (diff) | |
parent | 64ce5f8fab077e4792737f86502d0e77ad6cbb0b (diff) | |
download | frameworks_base-438a92cd068e72c66b8ae2d4582e363032c6a7ba.zip frameworks_base-438a92cd068e72c66b8ae2d4582e363032c6a7ba.tar.gz frameworks_base-438a92cd068e72c66b8ae2d4582e363032c6a7ba.tar.bz2 |
am 64ce5f8f: GpsLocationProvider: Read data enabled status from TelephonyManager.
* commit '64ce5f8fab077e4792737f86502d0e77ad6cbb0b':
GpsLocationProvider: Read data enabled status from TelephonyManager.
Diffstat (limited to 'services')
-rw-r--r-- | services/core/java/com/android/server/location/GpsLocationProvider.java | 4 |
1 files changed, 1 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 bec0e22..5ae6300 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 @@ 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().getDataEnabled(); boolean networkAvailable = info.isAvailable() && dataEnabled; String defaultApn = getSelectedApn(); if (defaultApn == null) { |