diff options
| author | Shishir Agrawal <shishir@google.com> | 2015-02-11 03:44:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-11 03:44:42 +0000 |
| commit | b7e04f3294d2ce60450fcc6881249b6b0c6c30b0 (patch) | |
| tree | b5150488e8b9130cb9eda42c7d0c105733d62217 /services | |
| parent | 5ff571155f0a405d6f7d298c7acaddc84bb8fb26 (diff) | |
| parent | 6b274720c5a210c07256e5b9fc11a1e9aca59017 (diff) | |
| download | frameworks_base-b7e04f3294d2ce60450fcc6881249b6b0c6c30b0.zip frameworks_base-b7e04f3294d2ce60450fcc6881249b6b0c6c30b0.tar.gz frameworks_base-b7e04f3294d2ce60450fcc6881249b6b0c6c30b0.tar.bz2 | |
GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8
automerge: 6b27472
* commit '6b274720c5a210c07256e5b9fc11a1e9aca59017':
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 2a1f7d6..af2da89 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) { |