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

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

Browse Source 
* commit 'b0cbf8607fb00a2bc54d15e01570cabf147fb5fb':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
This commit is contained in:
Brian Carlstrom
2013-03-04 10:52:49 -08:00
committed by Android Git Automerger
parent 237940a092 b0cbf8607f
commit 6f2adcf9ab
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);
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);