Fix certificate and keychain installation on Android.

net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java

Index: net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
diff --git a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
index ff05ec84d2610790c4d939b262193bd557eff2a7..3d41b1b6ffc30516d5565313c085eb64ea152225 100644
--- a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
+++ b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
@@ -30,6 +30,18 @@ class AndroidNetworkLibrary {
 
     private static final String TAG = AndroidNetworkLibrary.class.getName();
 
+    // These values MUST match those defined in net/base/mime_utils.h
+    private static final int CERTIFICATE_TYPE_UNKNOWN = 0;
+
+    // The file is a DER-encoded X509 User certificate.
+    private static final int CERTIFICATE_TYPE_X509_USER_CERT = 2;
+
+    // The file is a DER-encoded X509 CA certificate.
+    private static final int CERTIFICATE_TYPE_X509_CA_CERT = 3;
+
+    // The file is a PKCS#12 archive containing a private key.
+    private static final int CERTIFICATE_TYPE_PKCS12_ARCHIVE = 4;
+
     /**
      * Stores the key pair through the CertInstaller activity.
      * @param context: current application context.
@@ -61,6 +73,47 @@ class AndroidNetworkLibrary {
     }
 
     /**
+      * Adds a cryptographic file (User certificate, a CA certificate or
+      * PKCS#12 keychain) through the system's CertInstaller activity.
+      *
+      * @param context: current application context.
+      * @param file_type: cryptographic file type. E.g. CERTIFICATE_TYPE_X509_USER_CERT.
+      * @param data: certificate/keychain data bytes.
+      * @return true on success, false on failure.
+      *
+      * Note that failure only indicates that the function couldn't launch the
+      * CertInstaller activity, not that the certificate/keychain was properly
+      * installed to the keystore.
+      */
+    @CalledByNative
+    static public boolean storeCertificate(Context context, int cert_type, byte[] data) {
+        try {
+            Intent intent = KeyChain.createInstallIntent();
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            switch (cert_type) {
+              case CERTIFICATE_TYPE_X509_USER_CERT:
+              case CERTIFICATE_TYPE_X509_CA_CERT:
+                intent.putExtra(KeyChain.EXTRA_CERTIFICATE, data);
+                break;
+
+              case CERTIFICATE_TYPE_PKCS12_ARCHIVE:
+                intent.putExtra(KeyChain.EXTRA_PKCS12, data);
+                break;
+
+              default:
+                Log.w(TAG, "invalid certificate type: " + cert_type);
+                return false;
+            }
+            context.startActivity(intent);
+            return true;
+        } catch (ActivityNotFoundException e) {
+            Log.w(TAG, "could not store crypto file: " + e);
+        }
+        return false;
+    }
+
+    /**
      * @return the mime type (if any) that is associated with the file
      *         extension. Returns null if no corresponding mime type exists.
      */