Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a43e60ad authored by Kevin Tang's avatar Kevin Tang Committed by Steve Kondik
Browse files

decouple SW FLP and HW FLP overlay flags 

currently there is only overlay flag shared by SW FLP and HW FLP. This
change allows having different overlay setting for sw / hw FLPs.

Change-Id: I643fa70380e7568ae851d23e87917a5b4b599fe8
CRs-Fixed: 622338
parent 11b4f60f

core/res/res/values/config.xml

+11 −1
Original line number Diff line number Diff line
@@ -781,8 +781,18 @@ 
         to false.

         -->

    <bool name="config_enableFusedLocationOverlay" translatable="false">true</bool>

    <!-- Whether to enable fused hardware provider overlay which allows fused

         hardware provider to be replaced by an app at run-time. When disabled,

         only the config_fusedLocationProviderPackageName package will be

         searched for fused location provider, 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_enableHwFlpOverlay" translatable="false">true</bool>

    <!-- Package name providing fused location support. Used only when

         config_enableFusedLocationOverlay is false. -->

         config_enableFusedLocationOverlay or config_enableHwFlpOverlay is false. -->

    <string name="config_fusedLocationProviderPackageName" translatable="false">com.android.location.fused</string>



    <!-- Whether to enable geocoder overlay which allows geocoder to be replaced

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1482,6 +1482,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_enableHwFlpOverlay" />

  <java-symbol type="bool" name="config_enableGeocoderOverlay" />

  <java-symbol type="bool" name="config_enableGeofenceOverlay" />

  <java-symbol type="bool" name="config_enableNetworkLocationOverlay" />

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

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
                mContext,

                mLocationHandler,

                flpHardwareProvider.getLocationHardware(),

                com.android.internal.R.bool.config_enableFusedLocationOverlay,

                com.android.internal.R.bool.config_enableHwFlpOverlay,

                com.android.internal.R.string.config_fusedLocationProviderPackageName,

                com.android.internal.R.array.config_locationProviderPackageNames);

        if(fusedProxy == null) {