summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-10-09 19:14:36 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-09 19:14:37 -0700
commit64ad9540850e2ffc1583564039510592c06264f5 (patch)
tree33a2121df87fbe3c64719bda7a84df48cfe6d17e /core
parent36db9d0879640a1cb9a8723d6649068a1c4c08de (diff)
parentb7c6a62a098834c602e95c422a03b58e3848dc18 (diff)
downloadframeworks_base-64ad9540850e2ffc1583564039510592c06264f5.zip
frameworks_base-64ad9540850e2ffc1583564039510592c06264f5.tar.gz
frameworks_base-64ad9540850e2ffc1583564039510592c06264f5.tar.bz2
Merge "Revert "Revert "Add config resource to help ATT prepaid""" into jb-mr1-dev
Diffstat (limited to 'core')
-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" />