Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev

Browse Source
This commit is contained in:
Ariel Gertzenstein
2015-01-09 17:56:10 +00:00
committed by Android (Google) Code Review
parent 7f7ea82c28 2999acb0ce
commit cce8db2c31
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/location/GpsLocationProvider.java
View File

@@ -788,8 +788,9 @@ public class GpsLocationProvider implements LocationProviderInterface {
} }
if (info != null) { if (info != null) {
boolean dataEnabled = TelephonyManager.getDefault() != null ? boolean dataEnabled = TelephonyManager.getIntWithSubId(mContext.getContentResolver(),
TelephonyManager.getDefault().getDataEnabled() : true; Settings.Global.MOBILE_DATA, SubscriptionManager.getDefaultSubId(),
1) == 1;
boolean networkAvailable = info.isAvailable() && dataEnabled; boolean networkAvailable = info.isAvailable() && dataEnabled;
String defaultApn = getSelectedApn(); String defaultApn = getSelectedApn();
if (defaultApn == null) { if (defaultApn == null) {