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

Merge change 4679 into donut

Browse Source 
* changes:
  Replace the dummy code with Keystore for <keygen> support.
This commit is contained in:
Android (Google) Code Review
2009-06-18 19:52:00 -07:00
parent c628297718 0de8e4398d
commit e0b7e916a1
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ package android.webkit;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.security.Keystore;
import android.util.Log; import android.util.Log;
final class JWebCoreJavaBridge extends Handler { final class JWebCoreJavaBridge extends Handler {
@@ -187,18 +188,11 @@ final class JWebCoreJavaBridge extends Handler {
} }
private String[] getKeyStrengthList() { private String[] getKeyStrengthList() {
// FIXME: fake the list for now return Keystore.getInstance().getSupportedKeyStrenghs();
String[] list = new String[2];
list[0] = "1024";
list[1] = "512";
return list;
} }
private String getSignedPublicKey(int index, String challenge, String url) { private String getSignedPublicKey(int index, String challenge, String url) {
// FIXME: do nothing for now return Keystore.getInstance().generateKeyPair(index, challenge, url);
Log.w(LOGTAG, "getSignedPublicKey for " + index + " and challenge="
+ challenge + " and url=" + url);
return "";
} }
private native void nativeConstructor(); private native void nativeConstructor();