diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-03-02 07:38:40 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-02 07:38:40 -0800 |
| commit | 04218254ec1129e329cac71479b309cfb8a28d88 (patch) | |
| tree | a520e1b38fb97f4cdce2a1b3bc200ee85483f2f0 /services/java/com/android/server/LocationManagerService.java | |
| parent | 7d7ce2bbdd884d307fa09e5e20a5e9282e087184 (diff) | |
| parent | 3b9ef08bbbdc95a609fa7883d6fff4b4fd22e33c (diff) | |
| download | frameworks_base-04218254ec1129e329cac71479b309cfb8a28d88.zip frameworks_base-04218254ec1129e329cac71479b309cfb8a28d88.tar.gz frameworks_base-04218254ec1129e329cac71479b309cfb8a28d88.tar.bz2 | |
Merge "Don't eat IllegalArgumentExceptions in LocationManagerService."
Diffstat (limited to 'services/java/com/android/server/LocationManagerService.java')
| -rw-r--r-- | services/java/com/android/server/LocationManagerService.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index cf2220c..eaf4802 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -825,6 +825,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } } catch (SecurityException se) { throw se; + } catch (IllegalArgumentException iae) { + throw iae; } catch (Exception e) { Slog.e(TAG, "requestUpdates got exception:", e); } @@ -838,6 +840,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } } catch (SecurityException se) { throw se; + } catch (IllegalArgumentException iae) { + throw iae; } catch (Exception e) { Slog.e(TAG, "requestUpdates got exception:", e); } @@ -892,6 +896,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } } catch (SecurityException se) { throw se; + } catch (IllegalArgumentException iae) { + throw iae; } catch (Exception e) { Slog.e(TAG, "removeUpdates got exception:", e); } @@ -904,6 +910,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } } catch (SecurityException se) { throw se; + } catch (IllegalArgumentException iae) { + throw iae; } catch (Exception e) { Slog.e(TAG, "removeUpdates got exception:", e); } @@ -1241,6 +1249,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } } catch (SecurityException se) { throw se; + } catch (IllegalArgumentException iae) { + throw iae; } catch (Exception e) { Slog.e(TAG, "addProximityAlert got exception:", e); } @@ -1286,6 +1296,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } } catch (SecurityException se) { throw se; + } catch (IllegalArgumentException iae) { + throw iae; } catch (Exception e) { Slog.e(TAG, "removeProximityAlert got exception:", e); } @@ -1316,6 +1328,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } } catch (SecurityException se) { throw se; + } catch (IllegalArgumentException iae) { + throw iae; } catch (Exception e) { Slog.e(TAG, "_getProviderInfo got exception:", e); return null; @@ -1351,6 +1365,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } } catch (SecurityException se) { throw se; + } catch (IllegalArgumentException iae) { + throw iae; } catch (Exception e) { Slog.e(TAG, "isProviderEnabled got exception:", e); return false; @@ -1386,6 +1402,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } } catch (SecurityException se) { throw se; + } catch (IllegalArgumentException iae) { + throw iae; } catch (Exception e) { Slog.e(TAG, "getLastKnownLocation got exception:", e); return null; |