Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31167ffb authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 42ca4975: am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use... 

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

* commit '42ca4975':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
parents cab82015 42ca4975

core/java/android/webkit/BrowserFrame.java

+1 −1
Original line number Diff line number Diff line
@@ -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,

core/java/android/webkit/ClientCertRequestHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -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);