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

Commit d5323174 authored by destradaa's avatar destradaa
Browse files

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

Change-Id: I6c15665118d52627978381935716436981a058d1
parent f8333cc3

core/res/res/values/config.xml

+13 −0
Original line number Diff line number Diff line
@@ -787,6 +787,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

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -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" />
@@ -1552,6 +1553,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" />

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

+2 −2
Original line number Diff line number Diff line
@@ -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.");