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

am 3adf7678: Merge change 4184 into donut

Browse Source 
Merge commit '3adf7678cdf8fa955627e096bb5c27b94adc3079'

* commit '3adf7678cdf8fa955627e096bb5c27b94adc3079':
  Add permission test structure for private framework permissions.
  Add <keygen> support for VPN.
This commit is contained in:
Android (Google) Code Review
2009-06-15 11:39:39 -07:00
committed by The Android Open Source Project
parent 9fac42f8bf 3adf7678cd
commit e3a6cf3eaa
4 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -222,6 +222,21 @@ final class JWebCoreJavaBridge extends Handler {
mHasDeferredTimers = 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();