summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2012-10-09 13:27:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-09 13:27:45 -0700
commit64cb35c078d58d9025d2f14b3674ca59f2e6d80b (patch)
tree615895c91ae4c5ea683e193cf472c0b26f4508af /core/res
parent160621280d7eaba7eeddc183c4c11aa49d32e30e (diff)
parent901ac560cafe0b8d76fd7441cbaf8749be33577c (diff)
downloadframeworks_base-64cb35c078d58d9025d2f14b3674ca59f2e6d80b.zip
frameworks_base-64cb35c078d58d9025d2f14b3674ca59f2e6d80b.tar.gz
frameworks_base-64cb35c078d58d9025d2f14b3674ca59f2e6d80b.tar.bz2
Merge "Add config resource to help ATT prepaid" into jb-mr1-dev
Diffstat (limited to 'core/res')
-rwxr-xr-xcore/res/res/values/config.xml5
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 6 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 26d04e9..4698002 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -988,4 +988,9 @@
<!-- Whether camera shutter sound is forced or not (country specific). -->
<bool name="config_camera_sound_forced">false</bool>
+ <!-- Set to true if we need to not prefer an APN.
+ This is being added to enable a simple scenario of pre-paid
+ provisioning on some carriers, working around a bug (7305641)
+ where if the preferred is used we don't try the others. -->
+ <bool name="config_dontPreferApn">false</bool>
</resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index fae63db..c48de1f 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -276,6 +276,7 @@
<java-symbol type="bool" name="config_useDevInputEventForAudioJack" />
<java-symbol type="bool" name="config_safe_media_volume_enabled" />
<java-symbol type="bool" name="config_camera_sound_forced" />
+ <java-symbol type="bool" name="config_dontPreferApn" />
<java-symbol type="integer" name="config_cursorWindowSize" />
<java-symbol type="integer" name="config_longPressOnPowerBehavior" />