summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-10-11 16:46:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-11 16:46:33 -0700
commitd1821cc06f58cc83f1d283b1ce38c947bd55d131 (patch)
tree2947c58e4e5e9b8a73cae39f77e9e15bd1d8fc6d /core/java
parent2203cf3f725220e6dc930ee77dbcde4ff7d885b6 (diff)
downloadframeworks_base-d1821cc06f58cc83f1d283b1ce38c947bd55d131.zip
frameworks_base-d1821cc06f58cc83f1d283b1ce38c947bd55d131.tar.gz
frameworks_base-d1821cc06f58cc83f1d283b1ce38c947bd55d131.tar.bz2
This is wrong since it fixed the symptom not the problem. Alan is uploading a correct patch.
Revert "Reducing WebView navigation timeout for accessibility." This reverts commit 2203cf3f725220e6dc930ee77dbcde4ff7d885b6 Change-Id: I5b2d999851af98acb953529ebfcda608ce27799d
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/AccessibilityInjector.java13
1 files changed, 1 insertions, 12 deletions
diff --git a/core/java/android/webkit/AccessibilityInjector.java b/core/java/android/webkit/AccessibilityInjector.java
index 37d84b3..d6576e1 100644
--- a/core/java/android/webkit/AccessibilityInjector.java
+++ b/core/java/android/webkit/AccessibilityInjector.java
@@ -710,18 +710,7 @@ class AccessibilityInjector {
"javascript:(function() { %s.onResult(%d, %s); })();";
// Time in milliseconds to wait for a result before failing.
- // Based on recorded times, we have found that in a complex real-world
- // web app (such as the desktop version of Gmail), there can be spikes
- // of ~2600ms in the worst case. These are temporary spikes and are not
- // repeatable; GMail eventually settles down to around ~60ms. The
- // longest duration that is consistently repeatable is ~300ms when
- // loading extremely large plain text documents in WebView.
- // If this timeout hits, the navigation is considered to have "failed",
- // meaning there is no content. Since the longer spikes are one-off
- // events triggered by the page loading and itself running a large
- // amount of JS, subsequent runs would succeed, so the worst impact
- // is that the first run will look like it had not loaded yet.
- private static final long RESULT_TIMEOUT = 1500;
+ private static final long RESULT_TIMEOUT = 5000;
private final AtomicInteger mResultIdCounter = new AtomicInteger();
private final Object mResultLock = new Object();