From c3575188c2f2ad27b1f03b9b9c0705a686a5e42f Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Tue, 9 Oct 2012 12:44:40 -0700
Subject: [PATCH] Add fused location provider to real provider list

During testing it's possible to mock a location provider, but the fused
location provider wasn't being inserted into the "mRealProviders" map so
when the fused location provider was unmocked, it would disappear
permanently from the list until the next reboot.

Bug: 6949478
Change-Id: I4993aa7fbbd21cea16bdbf2722d637c909b1cd73
---
 services/java/com/android/server/LocationManagerService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index e73d599297aa0..91f63da749763 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -308,6 +308,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
             addProviderLocked(fusedLocationProvider);
             mProxyProviders.add(fusedLocationProvider);
             mEnabledProviders.add(fusedLocationProvider.getName());
+            mRealProviders.put(LocationManager.FUSED_PROVIDER, fusedLocationProvider);
         } else {
             Slog.e(TAG, "no fused location provider found",
                     new IllegalStateException("Location service needs a fused location provider"));