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

Commit fa71a743 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

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

Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev automerge: c010c96f automerge: d1646dcf
automerge: 1cad8899

* commit '1cad8899':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
parents 701ee593 1cad8899

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

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

        }





        if (info != null) {

        if (info != null) {

            boolean dataEnabled = TelephonyManager.getDefault().getDataEnabled();

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

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