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

* commit '0ff79e88e2d90f80d0346e0485abe773ca85c44d':
  GPS: Changes to enable on-demand data call flow for CDMA connections
This commit is contained in:
Mike Lockwood
2011-07-28 13:23:01 -07:00
committed by Android Git Automerger

View File

@@ -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);