summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-01-26 10:19:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-26 10:19:00 -0800
commit3947716e696a693ea6bc1b22e5e720e00aaf3695 (patch)
treeedeb9888ada4c88e7f53e4b4d78f67f3b51bbb3f /telephony
parent29a208e12c9c29d9923c0b1b93e61cbc128f281c (diff)
parentc3a2747fee9f96fdcd075f582b5b4892cbecf7df (diff)
downloadframeworks_base-3947716e696a693ea6bc1b22e5e720e00aaf3695.zip
frameworks_base-3947716e696a693ea6bc1b22e5e720e00aaf3695.tar.gz
frameworks_base-3947716e696a693ea6bc1b22e5e720e00aaf3695.tar.bz2
am c3a2747f: am d8b525c3: Merge "Increase the default timeout from 30 to 60 seconds." into honeycomb
* commit 'c3a2747fee9f96fdcd075f582b5b4892cbecf7df': Increase the default timeout from 30 to 60 seconds.
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/RIL.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java
index c72a67b..dbc489a 100644
--- a/telephony/java/com/android/internal/telephony/RIL.java
+++ b/telephony/java/com/android/internal/telephony/RIL.java
@@ -214,7 +214,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
* Wake lock timeout should be longer than the longest timeout in
* the vendor ril.
*/
- private static final int DEFAULT_WAKE_LOCK_TIMEOUT = 30000;
+ private static final int DEFAULT_WAKE_LOCK_TIMEOUT = 60000;
//***** Instance Variables