drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"

Browse Source
This commit is contained in:
Brian Carlstrom
2013-03-04 17:50:14 +00:00
committed by Gerrit Code Review
parent f5276c16ad 6bae82a2ae
commit b0cbf8607f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/BrowserFrame.java
View File

@ -1324,7 +1324,7 @@ class BrowserFrame extends Handler {
private native void nativeSslCertErrorCancel(int handle, int certError); private native void nativeSslCertErrorCancel(int handle, int certError);
native void nativeSslClientCert(int handle, native void nativeSslClientCert(int handle,
int ctx, long ctx,
byte[][] asn1DerEncodedCertificateChain); byte[][] asn1DerEncodedCertificateChain);
native void nativeSslClientCert(int handle, native void nativeSslClientCert(int handle,

2
core/java/android/webkit/ClientCertRequestHandler.java
View File

@ -75,7 +75,7 @@ public final class ClientCertRequestHandler extends Handler {
/** /**
* Proceed with the specified private key bytes and client certificate chain. * Proceed with the specified private key bytes and client certificate chain.
*/ */
private void setSslClientCertFromCtx(final int ctx, final byte[][] chainBytes) { private void setSslClientCertFromCtx(final long ctx, final byte[][] chainBytes) {
post(new Runnable() { post(new Runnable() {
public void run() { public void run() {
mBrowserFrame.nativeSslClientCert(mHandle, ctx, chainBytes); mBrowserFrame.nativeSslClientCert(mHandle, ctx, chainBytes);