summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2012-10-05 02:32:52 -0500
committerJeff Hamilton <jham@android.com>2012-10-05 02:32:52 -0500
commit20de160ca32a8f2936a80ffd70551a22e2371d25 (patch)
treea83fa031e65604b5605a49dee597e3472f2b482b /core
parentd21b483904057212ab1654b8ef606d41f2d3fe46 (diff)
downloadframeworks_base-20de160ca32a8f2936a80ffd70551a22e2371d25.zip
frameworks_base-20de160ca32a8f2936a80ffd70551a22e2371d25.tar.gz
frameworks_base-20de160ca32a8f2936a80ffd70551a22e2371d25.tar.bz2
Revert "Changes to support updating location providers."
This reverts commit c19efc204aee1f0f3164dc21bd2ef3fdd4259c71.
Diffstat (limited to 'core')
-rwxr-xr-xcore/res/res/values/config.xml9
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 9 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index ad3234a..16960c8 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -636,12 +636,19 @@
of new location providers at run-time. The new package does not
have to be explicitly listed here, however it must have a signature
that matches the signature of at least one package on this list.
+ Platforms should overlay additional packages in
+ config_overlay_locationProviderPackageNames, instead of overlaying
+ this config, if they only want to append packages and not replace
+ the entire array.
-->
<string-array name="config_locationProviderPackageNames" translatable="false">
- <!-- The standard AOSP fused location provider -->
<item>com.android.location.fused</item>
</string-array>
+ <!-- Pacakge name(s) supplied by overlay, and appended to
+ config_locationProviderPackageNames. -->
+ <string-array name="config_overlay_locationProviderPackageNames" translatable="false" />
+
<!-- Boolean indicating if current platform supports bluetooth SCO for off call
use cases -->
<bool name="config_bluetooth_sco_off_call">true</bool>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 6eea65a..281d92a 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1467,6 +1467,7 @@
<java-symbol type="array" name="radioAttributes" />
<java-symbol type="array" name="config_oemUsbModeOverride" />
<java-symbol type="array" name="config_locationProviderPackageNames" />
+ <java-symbol type="array" name="config_overlay_locationProviderPackageNames" />
<java-symbol type="bool" name="config_animateScreenLights" />
<java-symbol type="bool" name="config_automatic_brightness_available" />
<java-symbol type="bool" name="config_sf_limitedAlpha" />