Stephen Smalley  committed b79ac75 Merge

Merge branch 'master' into seandroid

  • Participants
  • Parent commits 3a30615, b0cbf86
  • Branches seandroid

Comments (0)

Files changed (2)

File core/java/android/webkit/

     private native void nativeSslCertErrorCancel(int handle, int certError);
     native void nativeSslClientCert(int handle,
-                                    int ctx,
+                                    long ctx,
                                     byte[][] asn1DerEncodedCertificateChain);
     native void nativeSslClientCert(int handle,

File core/java/android/webkit/

      * 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);