diff options
| author | Jeff Hamilton <jham@android.com> | 2012-10-18 12:45:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-18 12:45:02 -0700 |
| commit | e09aed49e3498c9e0f3545ab97f816233d5eac66 (patch) | |
| tree | dc090688069342809ed399738e0d1c97b65ab7a7 /core/res | |
| parent | e9b533bff02d75fa11df4392d921f7f4d3d9c101 (diff) | |
| parent | fbadb69978be578cea9d2bf038de7c79b0787e4f (diff) | |
| download | frameworks_base-e09aed49e3498c9e0f3545ab97f816233d5eac66.zip frameworks_base-e09aed49e3498c9e0f3545ab97f816233d5eac66.tar.gz frameworks_base-e09aed49e3498c9e0f3545ab97f816233d5eac66.tar.bz2 | |
Merge "Changes to support updating location providers." into jb-mr1-dev
Diffstat (limited to 'core/res')
| -rwxr-xr-x | core/res/res/values/config.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 4698002..afd847f 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -636,19 +636,12 @@ 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 b3af161..7c0547e 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1475,7 +1475,6 @@ <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" /> |