am 5a21b0c2: Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev

* commit '5a21b0c2d0fca36fbbfb32641002ad4122c6b128':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
This commit is contained in:
Shishir Agrawal
2015-01-07 00:16:56 +00:00
committed by Android Git Automerger

View File

@@ -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) {