diff options
| author | destradaa <destradaa@google.com> | 2014-06-13 00:07:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 21:44:22 +0000 |
| commit | 45c9ef2021e678b85851dce51fd9c2f3698eb0b3 (patch) | |
| tree | 63d8eea15535e0e4e216f0ca39a3ff3b956871ec /services | |
| parent | 65599da8612b72973f0334286d10bf5f1219da0f (diff) | |
| parent | d5323174d85b6685672e321f045c44637e777618 (diff) | |
| download | frameworks_base-45c9ef2021e678b85851dce51fd9c2f3698eb0b3.zip frameworks_base-45c9ef2021e678b85851dce51fd9c2f3698eb0b3.tar.gz frameworks_base-45c9ef2021e678b85851dce51fd9c2f3698eb0b3.tar.bz2 | |
Merge "Separate Hardware Flp ServiceWatcher flags from the ones used by Software Flp."
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/LocationManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java index 5eee396..10382ba 100644 --- a/services/core/java/com/android/server/LocationManagerService.java +++ b/services/core/java/com/android/server/LocationManagerService.java @@ -479,8 +479,8 @@ public class LocationManagerService extends ILocationManager.Stub { mContext, mLocationHandler, flpHardwareProvider.getLocationHardware(), - com.android.internal.R.bool.config_enableFusedLocationOverlay, - com.android.internal.R.string.config_fusedLocationProviderPackageName, + com.android.internal.R.bool.config_enableHardwareFlpOverlay, + com.android.internal.R.string.config_hardwareFlpPackageName, com.android.internal.R.array.config_locationProviderPackageNames); if(fusedProxy == null) { Slog.e(TAG, "Unable to bind FusedProxy."); |