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

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

am e0b7e916: Merge change 4679 into donut 

Merge commit 'e0b7e916'

* commit 'e0b7e916':
  Replace the dummy code with Keystore for <keygen> support.
parents 49eb3301 e0b7e916

core/java/android/webkit/JWebCoreJavaBridge.java

+3 −9
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.webkit; 


import android.os.Handler;

import android.os.Message;

import android.security.Keystore;

import android.util.Log;



final class JWebCoreJavaBridge extends Handler {
@@ -222,18 +223,11 @@ final class JWebCoreJavaBridge extends Handler { 
    }



    private String[] getKeyStrengthList() {

        // FIXME: fake the list for now

        String[] list = new String[2];

        list[0] = "1024";

        list[1] = "512";

        return list;

        return Keystore.getInstance().getSupportedKeyStrenghs();

    }



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

        // FIXME: do nothing for now

        Log.w(LOGTAG, "getSignedPublicKey for " + index + " and challenge="

                + challenge + " and url=" + url);

        return "";

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

    }



    private native void nativeConstructor();