Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6181f392 authored by Adam Bliss's avatar Adam Bliss Committed by Android Git Automerger
Browse files

am 27ef0f73: am 9714d2c4: Merge "Don\'t throw an exception from... 

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

Merge commit '27ef0f73'

* commit '27ef0f73':
  Don't throw an exception from isProviderEnabled and getLastKnownLocation
parents 387b6580 27ef0f73

location/java/android/location/LocationManager.java

+2 −3
Original line number Diff line number Diff line
@@ -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) {

services/java/com/android/server/LocationManagerService.java

+2 −6
Original line number Diff line number Diff line
@@ -1614,8 +1614,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;
@@ -1639,7 +1637,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);

    }
@@ -1651,8 +1649,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;
@@ -1664,7 +1660,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)) {