Merge change 387 into donut
* changes:
Geocoder: Document behavior when no backend service is available.
diff --git a/location/java/com/android/internal/location/GpsLocationProvider.java b/location/java/com/android/internal/location/GpsLocationProvider.java
index c825724..924641c 100644
--- a/location/java/com/android/internal/location/GpsLocationProvider.java
+++ b/location/java/com/android/internal/location/GpsLocationProvider.java
@@ -218,7 +218,7 @@
if (Config.LOGD) {
Log.d(TAG, "state: " + state + " apnName: " + apnName + " reason: " + reason);
}
- if ("CONNECTED".equals(state)) {
+ if ("CONNECTED".equals(state) && apnName != null && apnName.length() > 0) {
mSuplApn = apnName;
if (mSuplDataConnectionState == SUPL_DATA_CONNECTION_OPENING) {
native_supl_data_conn_open(mSuplApn);