From 6bae82a2ae174670c97843af225d112907fce89f Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Wed, 27 Feb 2013 17:58:09 -0800 Subject: [PATCH] Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding Change-Id: Ieba5705f4faa7cea619cf509db3ef081fda570d5 --- core/java/android/webkit/BrowserFrame.java | 2 +- core/java/android/webkit/ClientCertRequestHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index c3a1a17d88a1..023dfa8dafe4 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -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, diff --git a/core/java/android/webkit/ClientCertRequestHandler.java b/core/java/android/webkit/ClientCertRequestHandler.java index dac151054198..f5a60f6e871d 100644 --- a/core/java/android/webkit/ClientCertRequestHandler.java +++ b/core/java/android/webkit/ClientCertRequestHandler.java @@ -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); -- 2.11.0