am ccc214b2: Merge change I6a0b14bd into eclair

Merge commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae' into eclair-mr2

* commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae':
  Make VCardComposer create the instance for mHandlerList.

1 files changed, 2 insertions, 4 deletions

diff --git a/core/java/android/pim/vcard/VCardComposer.java b/core/java/android/pim/vcard/VCardComposer.java
index 7b75f4a..c4711f8 100644
--- a/core/java/android/pim/vcard/VCardComposer.java
+++ b/core/java/android/pim/vcard/VCardComposer.java
@@ -294,7 +294,7 @@ public class VCardComposer {
     private final String mCharsetString;
     private final String mVCardAttributeCharset;
     private boolean mTerminateIsCalled;
-    private List<OneEntryHandler> mHandlerList;
+    final private List<OneEntryHandler> mHandlerList;
 
     private String mErrorReason = NO_ERROR;
 
@@ -371,6 +371,7 @@ public class VCardComposer {
         mUsesUtf8 = VCardConfig.usesUtf8(vcardType);
         mUsesShiftJis = VCardConfig.usesShiftJis(vcardType);
         mUsesQPToPrimaryProperties = VCardConfig.usesQPToPrimaryProperties(vcardType);
+        mHandlerList = new ArrayList<OneEntryHandler>();
 
         if (mIsDoCoMo) {
             mCharsetString = CharsetUtils.charsetForVendor(SHIFT_JIS, "docomo").name();
@@ -420,9 +421,6 @@ public class VCardComposer {
      * Must call before {{@link #init()}.
      */
     public void addHandler(OneEntryHandler handler) {
-        if (mHandlerList == null) {
-            mHandlerList = new ArrayList<OneEntryHandler>();
-        }
         mHandlerList.add(handler);
     }