diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-03-03 15:35:13 -0500 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2010-03-03 15:35:13 -0500 |
| commit | 689e449b244703335a27b076133377a192d6e36d (patch) | |
| tree | ebb3e7bc86f27a0c8db8b9111ff36a0d775567c9 /location | |
| parent | 687c44f2f02cecc4103c611ead225f990402d1af (diff) | |
| download | frameworks_base-689e449b244703335a27b076133377a192d6e36d.zip frameworks_base-689e449b244703335a27b076133377a192d6e36d.tar.gz frameworks_base-689e449b244703335a27b076133377a192d6e36d.tar.bz2 | |
Check for null provider in LocationManager.getProviders()
Change-Id: I294ce0b1f364cfdf956ac55260f9d40f0704b5f7
BUG: 2485977
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'location')
| -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 da760a1..9e4a16b 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>(); } |