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

Commit 7083ed44 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 

* commit '0ff79e88':
  GPS: Changes to enable on-demand data call flow for CDMA connections
parents cd01ad7c 0ff79e88

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

+6 −1
Original line number Diff line number Diff line
@@ -496,7 +496,12 @@ public class GpsLocationProvider implements LocationProviderInterface { 
        if (info != null && info.getType() == ConnectivityManager.TYPE_MOBILE_SUPL

                && mAGpsDataConnectionState == AGPS_DATA_CONNECTION_OPENING) {

            String apnName = info.getExtraInfo();

            if (mNetworkAvailable && apnName != null && apnName.length() > 0) {

            if (mNetworkAvailable) {

                if (apnName == null) {

                    /* Assign a dummy value in the case of C2K as otherwise we will have a runtime 

                    exception in the following call to native_agps_data_conn_open*/

                    apnName = "dummy-apn";

                }

                mAGpsApn = apnName;

                if (DEBUG) Log.d(TAG, "call native_agps_data_conn_open");

                native_agps_data_conn_open(apnName);