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

* commit 'a8a6b0848d1c11c3ed0fcb846e3d6c39b91536a0':
  Add fused location provider to real provider list
This commit is contained in:
Kenny Root
2012-10-09 15:23:58 -07:00
committed by Android Git Automerger

View File

@ -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"));