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

Commit e3a82231 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "decouple SW FLP and HW FLP overlay flags"

parents faeca933 76316241

core/res/res/values/config.xml

+11 −1
Original line number Diff line number Diff line
@@ -738,8 +738,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
@@ -1473,6 +1473,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
@@ -437,7 +437,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) {