Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Separate Hardware Flp ServiceWatcher flags from the ones used by Software Flp."

Browse Source
This commit is contained in:
destradaa
2014-06-13 00:07:24 +00:00
committed by Android (Google) Code Review
parent 65599da861 d5323174d8
commit 45c9ef2021
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/res/res/values/config.xml
View File

@@ -791,6 +791,19 @@
config_enableFusedLocationOverlay is false. -->
<string name="config_fusedLocationProviderPackageName" translatable="false">com.android.location.fused</string>
<!-- Whether to enable Hardware FLP overlay which allows Hardware FLP to be
replaced by an app at run-time. When disabled, only the
config_hardwareFlpPackageName package will be searched for Hardware Flp,
otherwise packages whose signature matches the signatures of
config_locationProviderPackageNames will be searched, and the service
with the highest version number will be picked. Anyone who wants to
disable the overlay mechanism can set it to false.
-->
<bool name="config_enableHardwareFlpOverlay" translatable="false">true</bool>
<!-- Package name providing Hardware Flp. Used only when
config_enableHardwareFlpOverlay is false. -->
<string name="config_hardwareFlpPackageName" translatable="false">com.android.location.fused</string>
<!-- Whether to enable geocoder overlay which allows geocoder to be replaced
by an app at run-time. When disabled, only the
config_geocoderProviderPackageName package will be searched for

2
core/res/res/values/symbols.xml
View File

@@ -1462,6 +1462,7 @@
<java-symbol type="bool" name="config_animateScreenLights" />
<java-symbol type="bool" name="config_automatic_brightness_available" />
<java-symbol type="bool" name="config_enableFusedLocationOverlay" />
<java-symbol type="bool" name="config_enableHardwareFlpOverlay" />
<java-symbol type="bool" name="config_enableGeocoderOverlay" />
<java-symbol type="bool" name="config_enableGeofenceOverlay" />
<java-symbol type="bool" name="config_enableNetworkLocationOverlay" />
@@ -1553,6 +1554,7 @@
<java-symbol type="string" name="chooser_wallpaper" />
<java-symbol type="string" name="config_datause_iface" />
<java-symbol type="string" name="config_fusedLocationProviderPackageName" />
<java-symbol type="string" name="config_hardwareFlpPackageName" />
<java-symbol type="string" name="config_geocoderProviderPackageName" />
<java-symbol type="string" name="config_geofenceProviderPackageName" />
<java-symbol type="string" name="config_networkLocationProviderPackageName" />

4
services/core/java/com/android/server/LocationManagerService.java
View File

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