Merge change 4075 into donut

* changes:
  Add <keygen> support for VPN.

1 files changed, 15 insertions, 0 deletions

diff --git a/core/java/android/webkit/JWebCoreJavaBridge.java b/core/java/android/webkit/JWebCoreJavaBridge.java
index 2a84683..7739300 100644
--- a/core/java/android/webkit/JWebCoreJavaBridge.java
+++ b/core/java/android/webkit/JWebCoreJavaBridge.java
@@ -186,6 +186,21 @@ final class JWebCoreJavaBridge extends Handler {
         mHasInstantTimer = false;
     }
 
+    private String[] getKeyStrengthList() {
+        // FIXME: fake the list for now
+        String[] list = new String[2];
+        list[0] = "1024";
+        list[1] = "512";
+        return list;
+    }
+
+    private String getSignedPublicKey(int index, String challenge, String url) {
+        // FIXME: do nothing for now
+        Log.w(LOGTAG, "getSignedPublicKey for " + index + " and challenge="
+                + challenge + " and url=" + url);
+        return "";
+    }
+
     private native void nativeConstructor();
     private native void nativeFinalize();
     private native void sharedTimerFired();