Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 629f94fa authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android Git Automerger
Browse files

am ccc214b2: Merge change I6a0b14bd into eclair 

Merge commit 'ccc214b2' into eclair-mr2

* commit 'ccc214b2':
  Make VCardComposer create the instance for mHandlerList.
parents 6cd206ab ccc214b2

core/java/android/pim/vcard/VCardComposer.java

+2 −4
Original line number Diff line number Diff line
@@ -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);

    }