commit b5ccb59e06920317642a655bf1b9ed840cb05182
author Mike Lockwood <lockwood@android.com> Tue Mar 02 18:06:30 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 02 18:06:30 2010 -0800
tree d6cdc6a3d9c0d99d369822f7e0b5147780ed6720
parent 25c374e83659e1a468fa110af92ef4b89144deef
parent faa7e8363e71cb441bf1cf5f17cb1679d9ced99f

Merge "DockObserver: Watch for exceptions in LocationManger.isProviderEnabled()."

services/java/com/android/server/DockObserver.java

diff --git a/services/java/com/android/server/DockObserver.java b/services/java/com/android/server/DockObserver.java
index 25ebee4..547a2a1 100644
--- a/services/java/com/android/server/DockObserver.java
+++ b/services/java/com/android/server/DockObserver.java
@@ -421,9 +421,19 @@
                     }
                     break;
                 case MSG_ENABLE_LOCATION_UPDATES:
-                    if (mLocationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
+                    boolean networkLocationEnabled;
+                    try {
+                        networkLocationEnabled =
+                            mLocationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
+                    } catch (Exception e) {
+                        // we may get IllegalArgumentException if network location provider
+                        // does not exist or is not yet installed.
+                        networkLocationEnabled = false;
+                    }
+                    if (networkLocationEnabled) {
                         mLocationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER,
-                                LOCATION_UPDATE_MS, LOCATION_UPDATE_DISTANCE_METER, mLocationListener);
+                                LOCATION_UPDATE_MS, LOCATION_UPDATE_DISTANCE_METER, 
+                                mLocationListener);
                         retrieveLocation();
                         if (mCarModeEnabled && mLocation != null && mNightMode == MODE_NIGHT_AUTO) {
                             try {