diff --git a/services/core/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GpsLocationProvider.java index a3ad914ef7b1f..9c0f9874b5bc1 100644 --- a/services/core/java/com/android/server/location/GpsLocationProvider.java +++ b/services/core/java/com/android/server/location/GpsLocationProvider.java @@ -788,8 +788,9 @@ public class GpsLocationProvider implements LocationProviderInterface { } if (info != null) { - boolean dataEnabled = TelephonyManager.getDefault() != null ? - TelephonyManager.getDefault().getDataEnabled() : true; + boolean dataEnabled = TelephonyManager.getIntWithSubId(mContext.getContentResolver(), + Settings.Global.MOBILE_DATA, SubscriptionManager.getDefaultSubId(), + 1) == 1; boolean networkAvailable = info.isAvailable() && dataEnabled; String defaultApn = getSelectedApn(); if (defaultApn == null) {