From 689e449b244703335a27b076133377a192d6e36d Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Wed, 3 Mar 2010 15:35:13 -0500
Subject: [PATCH] Check for null provider in LocationManager.getProviders()

Change-Id: I294ce0b1f364cfdf956ac55260f9d40f0704b5f7
BUG: 2485977

Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 location/java/android/location/LocationManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index da760a1dd3f81..9e4a16b241e6c 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>();
                 }