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

am 42ca4975: am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"

Browse Source 
* commit '42ca4975dc6ec2c206f8e7e883e1d0d549b44c95':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
This commit is contained in:
Brian Carlstrom
2013-03-05 01:00:06 +00:00
committed by Android Git Automerger
parent cab8201526 42ca4975dc
commit 31167ffb2d
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

@@ -1322,7 +1322,7 @@ class BrowserFrame extends Handler {
private native void nativeSslCertErrorCancel(int handle, int certError);
native void nativeSslClientCert(int handle,
int ctx,
long ctx,
byte[][] asn1DerEncodedCertificateChain);
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.
*/
private void setSslClientCertFromCtx(final int ctx, final byte[][] chainBytes) {
private void setSslClientCertFromCtx(final long ctx, final byte[][] chainBytes) {
post(new Runnable() {
public void run() {
mBrowserFrame.nativeSslClientCert(mHandle, ctx, chainBytes);