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

Commit 03d7b6f2 authored by Shishir Agrawal's avatar Shishir Agrawal Committed by Android Git Automerger
Browse files

am 7b895dea: am d0173277: am 5a21b0c2: Merge "GpsLocationProvider: Read data... 

am 7b895dea: am d0173277: am 5a21b0c2: Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev

* commit '7b895dea':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
parents 5c72de4c 7b895dea

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

+1 −3
Original line number Diff line number Diff line
@@ -788,9 +788,7 @@ 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().getDataEnabled();

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

            String defaultApn = getSelectedApn();

            if (defaultApn == null) {