Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e8a1f6af: Merge change 4961 into donut

Browse Source 
Merge commit 'e8a1f6af96d09d8105621932073d6f79e24a5dc9'

* commit 'e8a1f6af96d09d8105621932073d6f79e24a5dc9':
  Set organizations to be null for generateKeyPair to use the default.
This commit is contained in:
Android (Google) Code Review
2009-06-22 16:24:31 -07:00
committed by The Android Open Source Project
parent 61f24e58d6 e8a1f6af96
commit 526abb93fb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/webkit/JWebCoreJavaBridge.java
View File

@@ -227,7 +227,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();