From c633253bef85252e44ffb86500b50943a024246c Mon Sep 17 00:00:00 2001
From: Chia-chi Yeh <chiachi@android.com>
Date: Fri, 18 Sep 2009 13:55:43 +0800
Subject: [PATCH] CertTool: avoid using final static array.

---
 core/java/android/webkit/CertTool.java           | 6 ++++--
 core/java/android/webkit/JWebCoreJavaBridge.java | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/java/android/webkit/CertTool.java b/core/java/android/webkit/CertTool.java
index e5540df41ef6d..99757d24f00ad 100644
--- 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 508409808a8d1..f350d139edcc4 100644
--- 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) {