Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f53dda1c authored by Shishir Agrawal's avatar Shishir Agrawal Committed by android-build-merger
Browse files

am bde7bc45: GpsLocationProvider: Read data enabled status from TelephonyManager. 

automerge: 2db79771

* commit '2db79771':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
parents eb896e1f 2db79771

services/core/java/com/android/server/location/GpsLocationProvider.java

+2 −3
Original line number Diff line number Diff line
@@ -788,9 +788,8 @@ 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() != null ?

                TelephonyManager.getDefault().getDataEnabled() : true;

            boolean networkAvailable = info.isAvailable() && dataEnabled;

            String defaultApn = getSelectedApn();

            if (defaultApn == null) {