summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2009-10-19 15:30:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-19 15:30:01 -0700
commitb0f4d0cd249773927c891ab52505505b6b19347b (patch)
tree78ceace933ae91a98c160aa90ca60041d9b796d2 /core/res
parent39f4408f994a37fd805c964c673ec7ad1702a817 (diff)
parentf37447bad3773b62176baa837908daf6edb44273 (diff)
downloadframeworks_base-b0f4d0cd249773927c891ab52505505b6b19347b.zip
frameworks_base-b0f4d0cd249773927c891ab52505505b6b19347b.tar.gz
frameworks_base-b0f4d0cd249773927c891ab52505505b6b19347b.tar.bz2
am f37447ba: Proper fix for zero signal strength and no_service. Fixes #2176141
Merge commit 'f37447bad3773b62176baa837908daf6edb44273' into eclair-mr2 * commit 'f37447bad3773b62176baa837908daf6edb44273': Proper fix for zero signal strength and no_service. Fixes #2176141
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/config.xml4
-rw-r--r--core/res/res/xml/power_profile.xml4
2 files changed, 7 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 45fcaa59..780f611 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -40,6 +40,10 @@
<!-- The duration (in milliseconds) of a long animation. -->
<integer name="config_longAnimTime">400</integer>
+ <!-- The duration (in milliseconds) that the radio will scan for a signal
+ when there's no network connection. If the scan doesn't timeout, use zero -->
+ <integer name="config_radioScanningTimeout">0</integer>
+
<!-- XXXXX NOTE THE FOLLOWING RESOURCES USE THE WRONG NAMING CONVENTION.
Please don't copy them, copy anything else. -->
diff --git a/core/res/res/xml/power_profile.xml b/core/res/res/xml/power_profile.xml
index 710b71e..ce623e8 100644
--- a/core/res/res/xml/power_profile.xml
+++ b/core/res/res/xml/power_profile.xml
@@ -29,10 +29,12 @@
<item name="dsp.audio">0.1</item>
<item name="dsp.video">0.1</item>
<item name="radio.active">1</item>
+ <!-- The current consumed by the radio when it is scanning for a signal -->
+ <item name="radio.scanning">0.5</item>
<item name="gps.on">1</item>
<!-- Current consumed by the radio at different signal strengths, when paging -->
<array name="radio.on"> <!-- Strength 0 to BINS-1 -->
- <value>1</value>
+ <value>0.2</value>
<value>0.1</value>
</array>
<!-- Different CPU speeds as reported in