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

Commit d82f9988 authored by Ariel Gertzenstein's avatar Ariel Gertzenstein Committed by Android Git Automerger
Browse files

am 4a207e3e: Merge "Revert "GpsLocationProvider: Read data enabled status from... 

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

* commit '4a207e3e':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
parents faafecaa 4a207e3e

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

+3 −2
Original line number Diff line number Diff line
@@ -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) {