summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-06-19 15:03:46 -0700
committerGrace Kloba <klobag@google.com>2009-06-19 15:09:34 -0700
commit3af8e9389e008c0076b86cc6b3c6f005e7473d10 (patch)
tree84acce43fa9a460e2d888cea9df28b0bbe1ec5ee /keystore
parent5254657540b0a6ad54be6229b68fa5626e4ef9e5 (diff)
downloadframeworks_base-3af8e9389e008c0076b86cc6b3c6f005e7473d10.zip
frameworks_base-3af8e9389e008c0076b86cc6b3c6f005e7473d10.tar.gz
frameworks_base-3af8e9389e008c0076b86cc6b3c6f005e7473d10.tar.bz2
Change addCertificate to take byte[] instead of String as we don't know the encoding.
In WebView, if we run into the certificate, we will save it to the Keystore instead of sending it to the WebKit.
Diffstat (limited to 'keystore')
-rw-r--r--keystore/java/android/security/Keystore.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/java/android/security/Keystore.java b/keystore/java/android/security/Keystore.java
index ce3fa88..2a3e6a7 100644
--- a/keystore/java/android/security/Keystore.java
+++ b/keystore/java/android/security/Keystore.java
@@ -88,7 +88,7 @@ public abstract class Keystore {
public abstract String generateKeyPair(
int keyStrengthIndex, String challenge, String organizations);
- public abstract void addCertificate(String cert);
+ public abstract void addCertificate(byte[] cert);
private static class FileKeystore extends Keystore {
private static final String SERVICE_NAME = "keystore";
@@ -217,7 +217,7 @@ public abstract class Keystore {
}
@Override
- public void addCertificate(String cert) {
+ public void addCertificate(byte[] cert) {
// TODO: real implementation
}