diff options
| -rw-r--r-- | location/java/android/location/LocationManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index da760a1dd3f8..9e4a16b241e6 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -317,7 +317,7 @@ public class LocationManager { List<String> providers = getProviders(enabledOnly); for (String providerName : providers) { LocationProvider provider = getProvider(providerName); - if (provider.meetsCriteria(criteria)) { + if (provider != null && provider.meetsCriteria(criteria)) { if (goodProviders.isEmpty()) { goodProviders = new ArrayList<String>(); } |