summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-05-31 17:58:14 +0100
committerKristian Monsen <kristianm@google.com>2011-05-31 17:58:14 +0100
commitd615dff3cad080859e4d5d6075c9e98178ae8bd9 (patch)
treed7fd73ed6dc9e520d730ca7d2b8409d1835575b9
parent5156240464ba682e81384501aca310de18baf1e6 (diff)
downloadexternal_webkit-d615dff3cad080859e4d5d6075c9e98178ae8bd9.zip
external_webkit-d615dff3cad080859e4d5d6075c9e98178ae8bd9.tar.gz
external_webkit-d615dff3cad080859e4d5d6075c9e98178ae8bd9.tar.bz2
Fix reboot loop on master ToT
Change-Id: I34534273f70c1fe32b83f994808de03616c85922
-rw-r--r--Source/WebKit/android/jni/JavaBridge.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/JavaBridge.cpp b/Source/WebKit/android/jni/JavaBridge.cpp
index 359af42..8c17c85 100644
--- a/Source/WebKit/android/jni/JavaBridge.cpp
+++ b/Source/WebKit/android/jni/JavaBridge.cpp
@@ -496,7 +496,7 @@ static JNINativeMethod gWebCoreJavaBridgeMethods[] = {
(void*) JavaBridge::AddPackageName },
{ "removePackageName", "(Ljava/lang/String;)V",
(void*) JavaBridge::RemovePackageName },
- { "updateProxy", "(Ljava/lang/String;)V",
+ { "nativeUpdateProxy", "(Ljava/lang/String;Ljava/lang/String;)V",
(void*) JavaBridge::UpdateProxy }
};