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

Commit 526abb93 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am e8a1f6af: Merge change 4961 into donut 

Merge commit 'e8a1f6af'

* commit 'e8a1f6af':
  Set organizations to be null for generateKeyPair to use the default.
parents 61f24e58 e8a1f6af

core/java/android/webkit/JWebCoreJavaBridge.java

+2 −1
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ final class JWebCoreJavaBridge extends Handler { 
    }



    private String getSignedPublicKey(int index, String challenge, String url) {

        return Keystore.getInstance().generateKeyPair(index, challenge, url);

        // generateKeyPair expects organizations which we don't have. Ignore url.

        return Keystore.getInstance().generateKeyPair(index, challenge, null);

    }



    private native void nativeConstructor();