CertTool: avoid using final static array.

diff --git a/core/java/android/webkit/CertTool.java b/core/java/android/webkit/CertTool.java
index e5540df..99757d2 100644 (file)
--- a/core/java/android/webkit/CertTool.java
+++ b/core/java/android/webkit/CertTool.java
@@ -36,11 +36,13 @@ class CertTool {
     private static final AlgorithmIdentifier MD5_WITH_RSA =
             new AlgorithmIdentifier(PKCSObjectIdentifiers.md5WithRSAEncryption);
 
-    static final String[] KEY_STRENGTH_LIST = {"High Grade", "Medium Grade"};
-
     static final String CERT = Credentials.CERTIFICATE;
     static final String PKCS12 = Credentials.PKCS12;
 
+    static String[] getKeyStrengthList() {
+        return new String[] {"High Grade", "Medium Grade"};
+    }
+
     static String getSignedPublicKey(Context context, int index, String challenge) {
         try {
             KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA");

diff --git a/core/java/android/webkit/JWebCoreJavaBridge.java b/core/java/android/webkit/JWebCoreJavaBridge.java
index 5084098..f350d13 100644 (file)
--- a/core/java/android/webkit/JWebCoreJavaBridge.java
+++ b/core/java/android/webkit/JWebCoreJavaBridge.java
@@ -233,7 +233,7 @@ final class JWebCoreJavaBridge extends Handler {
     }
 
     private String[] getKeyStrengthList() {
-        return CertTool.KEY_STRENGTH_LIST;
+        return CertTool.getKeyStrengthList();
     }
 
     private String getSignedPublicKey(int index, String challenge, String url) {