From 3b9ef08bbbdc95a609fa7883d6fff4b4fd22e33c Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Tue, 2 Mar 2010 10:33:55 -0500
Subject: Don't eat IllegalArgumentExceptions in LocationManagerService.

The exeptions should be returned to the Binder client instead.

Change-Id: I8ab36880622bf8b4fdf28407dec50652c48b6712
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 .../com/android/server/LocationManagerService.java     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index cf2220ccb1cc..eaf4802983de 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;
-- 
cgit v1.2.3-59-g8ed1b