diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-10-22 09:16:17 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2010-10-22 09:16:17 -0400 |
| commit | edc0f3876ce6e14f0ce35ad950c55031694fd4f8 (patch) | |
| tree | 17528833f3e8aadea97bef222471b76eb7a7b777 /services | |
| parent | 1257d330dcfdb87214278c8fc9718ea9fc663df6 (diff) | |
| download | frameworks_base-edc0f3876ce6e14f0ce35ad950c55031694fd4f8.zip frameworks_base-edc0f3876ce6e14f0ce35ad950c55031694fd4f8.tar.gz frameworks_base-edc0f3876ce6e14f0ce35ad950c55031694fd4f8.tar.bz2 | |
GPS: Fix network type logic in requestRefLocation
Change-Id: I20ef81bcf029b289389dba57e6cf457fda5acbf4
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'services')
| -rwxr-xr-x | services/java/com/android/server/location/GpsLocationProvider.java | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/services/java/com/android/server/location/GpsLocationProvider.java b/services/java/com/android/server/location/GpsLocationProvider.java index 4a6b5f4..755a228 100755 --- a/services/java/com/android/server/location/GpsLocationProvider.java +++ b/services/java/com/android/server/location/GpsLocationProvider.java @@ -1451,23 +1451,30 @@ public class GpsLocationProvider implements LocationProviderInterface { mContext.getSystemService(Context.TELEPHONY_SERVICE); if (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM) { GsmCellLocation gsm_cell = (GsmCellLocation) phone.getCellLocation(); - if ((gsm_cell != null) && (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM) - && (phone.getNetworkOperator().length() > 3)) { + if ((gsm_cell != null) && (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM) && + (phone.getNetworkOperator() != null) && + (phone.getNetworkOperator().length() > 3)) { int type; int mcc = Integer.parseInt(phone.getNetworkOperator().substring(0,3)); int mnc = Integer.parseInt(phone.getNetworkOperator().substring(3)); - if (phone.getNetworkType() == TelephonyManager.NETWORK_TYPE_UMTS) + int networkType = phone.getNetworkType(); + if (networkType == TelephonyManager.NETWORK_TYPE_UMTS + || networkType == TelephonyManager.NETWORK_TYPE_HSDPA + || networkType == TelephonyManager.NETWORK_TYPE_HSUPA + || networkType == TelephonyManager.NETWORK_TYPE_HSPA) { type = AGPS_REF_LOCATION_TYPE_UMTS_CELLID; - else + } else { type = AGPS_REF_LOCATION_TYPE_GSM_CELLID; + } native_agps_set_ref_location_cellid(type, mcc, mnc, gsm_cell.getLac(), gsm_cell.getCid()); - } - else + } else { Log.e(TAG,"Error getting cell location info."); + } } - else + else { Log.e(TAG,"CDMA not supported."); + } } private void sendMessage(int message, int arg, Object obj) { |