am f72c9d03: am 07cfed1b: am 64ad9540: Merge "Revert "Revert "Add config resource to help ATT prepaid""" into jb-mr1-dev

* commit 'f72c9d030960c1e2f634adf2f5f2406a1e413f72':
  Revert "Revert "Add config resource to help ATT prepaid""
This commit is contained in:
Baligh Uddin
2012-10-09 19:23:03 -07:00
committed by Android Git Automerger
2 changed files with 6 additions and 0 deletions

View File

@@ -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>

View File

@@ -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" />