Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4954 into donut

Browse Source 
* changes:
  gps: Check for null APN name to avoid a runtime restart.
This commit is contained in:
Android (Google) Code Review
2009-06-22 13:22:48 -07:00
parent 856dd8a60a b362a9ab91
commit cde13e6bfa
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
location/java/com/android/internal/location/GpsLocationProvider.java
View File

@@ -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) {
native_agps_data_conn_open(mAGpsApn); if (mAGpsApn != null) {
mAGpsDataConnectionState = AGPS_DATA_CONNECTION_OPEN; 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) { } else if (result == Phone.APN_REQUEST_STARTED) {
mAGpsDataConnectionState = AGPS_DATA_CONNECTION_OPENING; mAGpsDataConnectionState = AGPS_DATA_CONNECTION_OPENING;
} else { } else {