drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread

Browse Source 
Merge commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp

* commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599':
  Don't throw an exception from isProviderEnabled and getLastKnownLocation
This commit is contained in:
Adam Bliss
2010-07-19 08:36:26 -07:00
committed by Android Git Automerger
parent 5e782937ea 9714d2c4d2
commit 27ef0f732c
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
location/java/android/location/LocationManager.java
View File

@ -424,8 +424,7 @@ public class LocationManager {
* {@link LocationListener#onLocationChanged} method will be called for
* each location update
*
* @throws IllegalArgumentException if provider is null or doesn't exist
* @throws IllegalArgumentException if listener is null
* @throws IllegalArgumentException if provider or listener is null
* @throws RuntimeException if the calling thread has no Looper
* @throws SecurityException if no suitable permission is present for the provider.
*/
@ -977,7 +976,7 @@ public class LocationManager {
* @return true if the provider is enabled
*
* @throws SecurityException if no suitable permission is present for the provider.
* @throws IllegalArgumentException if provider is null or doesn't exist
* @throws IllegalArgumentException if provider is null
*/
public boolean isProviderEnabled(String provider) {
if (provider == null) {

8
services/java/com/android/server/LocationManagerService.java
View File

@ -1613,8 +1613,6 @@ 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;
@ -1638,7 +1636,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
LocationProviderInterface p = mProvidersByName.get(provider);
if (p == null) {
throw new IllegalArgumentException("provider=" + provider);
return false;
}
return isAllowedBySettingsLocked(provider);
}
@ -1650,8 +1648,6 @@ 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;
@ -1663,7 +1659,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
LocationProviderInterface p = mProvidersByName.get(provider);
if (p == null) {
throw new IllegalArgumentException("provider=" + provider);
return null;
}
if (!isAllowedBySettingsLocked(provider)) {