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

Commit b32831ee authored by Ariel Gertzenstein's avatar Ariel Gertzenstein Committed by android-build-merger
Browse files

Merge "Revert "GpsLocationProvider: Read data enabled status from... 

Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev
automerge: cce8db2c

* commit 'cce8db2c':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
parents 34f3aded cce8db2c

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -788,8 +788,9 @@ public class GpsLocationProvider implements LocationProviderInterface { 
        }

        }





        if (info != null) {

        if (info != null) {

            boolean dataEnabled = TelephonyManager.getDefault() != null ?

            boolean dataEnabled = TelephonyManager.getIntWithSubId(mContext.getContentResolver(),

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

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