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

Commit 07086eb9 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change Ifb63d236 into eclair-mr2 

* changes:
  Add cancel() VCardDataBuilder, which is intended to remove a false alerm "Nested VCard code is not supported now." when importing vCard 3.0 file.
parents 3448b676 71f97ac8

core/java/android/pim/vcard/VCardDataBuilder.java

+13 −1
Original line number Diff line number Diff line
@@ -126,6 +126,18 @@ public class VCardDataBuilder implements VCardBuilder { 
        }

    }



    /**

     * Called when the parse failed between startRecord() and endRecord().

     * Currently it happens only when the vCard format is 3.0.

     * (VCardVersionException is thrown by VCardParser_V21 and this object is reused by

     * VCardParser_V30. At that time, startRecord() is called twice before endRecord() is called.)

     * TODO: Should this be in VCardBuilder interface?

     */

    public void clear() {

        mCurrentContactStruct = null;

        mCurrentProperty = new ContactStruct.Property();

    }



    /**

     * Assume that VCard is not nested. In other words, this code does not accept 

     */