Merge "Add fused location provider to real provider list" into jb-mr1-dev

Author: kruton

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

@@ -308,6 +308,7 @@ Load package name(s) containing location provider support.
             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"));