From 9427c285df34a656a095645579d953565c67fea3 Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Mon, 22 Jun 2009 14:01:25 -0700
Subject: [PATCH] Set organizations to be null for generateKeyPair to use the
 default.

---
 core/java/android/webkit/JWebCoreJavaBridge.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/webkit/JWebCoreJavaBridge.java b/core/java/android/webkit/JWebCoreJavaBridge.java
index 7542e88367e24..5c0bd93251339 100644
--- a/core/java/android/webkit/JWebCoreJavaBridge.java
+++ b/core/java/android/webkit/JWebCoreJavaBridge.java
@@ -192,7 +192,8 @@ final class JWebCoreJavaBridge extends Handler {
     }
 
     private String getSignedPublicKey(int index, String challenge, String url) {
-        return Keystore.getInstance().generateKeyPair(index, challenge, url);
+        // generateKeyPair expects organizations which we don't have. Ignore url.
+        return Keystore.getInstance().generateKeyPair(index, challenge, null);
     }
 
     private native void nativeConstructor();