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

Commit 15d74865 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am cde13e6b: Merge change 4954 into donut 

Merge commit 'cde13e6b'

* commit 'cde13e6b':
  gps: Check for null APN name to avoid a runtime restart.
parents 4527acb0 cde13e6b

location/java/com/android/internal/location/GpsLocationProvider.java

+7 −2
Original line number Diff line number Diff line
@@ -949,8 +949,13 @@ public class GpsLocationProvider extends ILocationProvider.Stub { 
                 int result = mConnMgr.startUsingNetworkFeature(

                        ConnectivityManager.TYPE_MOBILE, Phone.FEATURE_ENABLE_SUPL);

                if (result == Phone.APN_ALREADY_ACTIVE) {

                    if (mAGpsApn != null) {

                        native_agps_data_conn_open(mAGpsApn);

                        mAGpsDataConnectionState = AGPS_DATA_CONNECTION_OPEN;

                    } else {

                        Log.e(TAG, "mAGpsApn not set when receiving Phone.APN_ALREADY_ACTIVE");

                        native_agps_data_conn_failed();

                    }

                } else if (result == Phone.APN_REQUEST_STARTED) {

                    mAGpsDataConnectionState = AGPS_DATA_CONNECTION_OPENING;

                } else {