Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
5a21b0c2d0
@@ -788,9 +788,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (info != null) {
|
if (info != null) {
|
||||||
boolean dataEnabled = TelephonyManager.getIntWithSubId(mContext.getContentResolver(),
|
boolean dataEnabled = TelephonyManager.getDefault().getDataEnabled();
|
||||||
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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user