diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-03-04 17:50:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-04 17:50:14 +0000 |
| commit | b0cbf8607fb00a2bc54d15e01570cabf147fb5fb (patch) | |
| tree | 752887239ae8a12c896e3425451fa5fc5bed94fb /core/java/android/webkit/BrowserFrame.java | |
| parent | f5276c16ad97d94f8773938012ae54f8c7ba450a (diff) | |
| parent | 6bae82a2ae174670c97843af225d112907fce89f (diff) | |
Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
Diffstat (limited to 'core/java/android/webkit/BrowserFrame.java')
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 2 |
1 files changed, 1 insertions, 1 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, |