Make VCardComposer create the instance for mHandlerList.

Previously the creation was delayed until addHandler(), which
had been required to be called.

However, after VCardComoser's support toward PBAP stuffs,
the guarantee was not true any more.

So by creating the instance in constructor, we refrain NPE during
finalize() when PBAP uses VCardComposer.

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);
     }