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

Commit b362a9ab authored by Mike Lockwood's avatar Mike Lockwood
Browse files

gps: Check for null APN name to avoid a runtime restart. 



We still need to figure out how the APN name is getting set to empty string
by the telephony code.

Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent ecfb9f91

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

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

                 int result = mConnMgr.startUsingNetworkFeature(

                        ConnectivityManager.TYPE_MOBILE, Phone.FEATURE_ENABLE_SUPL);

                        ConnectivityManager.TYPE_MOBILE, Phone.FEATURE_ENABLE_SUPL);

                if (result == Phone.APN_ALREADY_ACTIVE) {

                if (result == Phone.APN_ALREADY_ACTIVE) {

                    if (mAGpsApn != null) {

                        native_agps_data_conn_open(mAGpsApn);

                        native_agps_data_conn_open(mAGpsApn);

                        mAGpsDataConnectionState = AGPS_DATA_CONNECTION_OPEN;

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

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

                    mAGpsDataConnectionState = AGPS_DATA_CONNECTION_OPENING;

                    mAGpsDataConnectionState = AGPS_DATA_CONNECTION_OPENING;

                } else {

                } else {