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."" into lmp-mr1-dev

Browse Source 
automerge: c010c96

* commit 'c010c96fdf143b242c9795a71b231ccb4658b625':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
This commit is contained in:
Bryce Lee
2015-01-08 04:32:40 +00:00
committed by android-build-merger
parent 62a1e753b1 c010c96fdf
commit d1646dcfd1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -788,7 +788,9 @@ public class GpsLocationProvider implements LocationProviderInterface {
} }
if (info != null) { 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; boolean networkAvailable = info.isAvailable() && dataEnabled;
String defaultApn = getSelectedApn(); String defaultApn = getSelectedApn();
if (defaultApn == null) { if (defaultApn == null) {