summaryrefslogtreecommitdiff
path: root/chromium/java/com/android/webview
diff options
context:
space:
mode:
authorJonathan Dixon <joth@google.com>2013-08-30 01:11:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-30 01:11:16 +0000
commit9cf31969a3e2e33d750b881ac6a4b3e980a5952a (patch)
treec9a9b49c60e33a55eb6df77371b8f4fdcdc7a66e /chromium/java/com/android/webview
parent3b31fa53b24614e84d1c04354abc2703391bfb19 (diff)
parentc0c86c037ea697da375ae28c543cae9b050d6b68 (diff)
downloadwebview-9cf31969a3e2e33d750b881ac6a4b3e980a5952a.tar.gz
Merge "Fix bug 10533304 - HD Wallpapers access getProgress on wrong thread" into klp-dev
Diffstat (limited to 'chromium/java/com/android/webview')
-rw-r--r--chromium/java/com/android/webview/chromium/WebViewChromium.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index 12be23b..3ef6320 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -540,7 +540,7 @@ class WebViewChromium implements WebViewProvider,
@Override
public int getProgress() {
- checkThread();
+ // No checkThread() because the value is cached java side (workaround for b/10533304).
return mAwContents.getMostRecentProgress();
}