Projects >> platform_frameworks_base >>395a20aeed0d7c58c978ed32cf50253280723cac

Chunk
Conflicting content 
    private static final String FLAG_TIMEZONE_UTC = "Z";

    public VCardComposer(Context context) {
<<<<<<< HEAD
        this(context, VCardConfig.VCARD_TYPE_DEFAULT, true);
    }

    public VCardComposer(Context context, int vcardType) {
        this(context, vcardType, true);
    }

    public VCardComposer(Context context, String vcardTypeStr, boolean careHandlerErrors) {
        this(context, VCardConfig.getVCardTypeFromString(vcardTypeStr), careHandlerErrors);
=======
        this(context, VCardConfig.VCARD_TYPE_DEFAULT, true, false, true);
    }

    public VCardComposer(Context context, String vcardTypeStr,
            boolean careHandlerErrors) {
        this(context, VCardConfig.getVCardTypeFromString(vcardTypeStr),
                careHandlerErrors, false, true);
    }

    public VCardComposer(Context context, int vcardType, boolean careHandlerErrors) {
        this(context, vcardType, careHandlerErrors, false, true);
>>>>>>> a229cedadd6c3b8ab7f2d8b7b45638753e834992
    }

    /**
Solution content 
    private static final String FLAG_TIMEZONE_UTC = "Z";

    public VCardComposer(Context context) {
        this(context, VCardConfig.VCARD_TYPE_DEFAULT, true);
    }

    public VCardComposer(Context context, int vcardType) {
        this(context, vcardType, true);
    }

    public VCardComposer(Context context, String vcardTypeStr, boolean careHandlerErrors) {
        this(context, VCardConfig.getVCardTypeFromString(vcardTypeStr), careHandlerErrors);
    }

    /**
File
VCardComposer.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Method invocation
Method signature
Chunk
Conflicting content 
    /**
     * Construct for supporting call log entry vCard composing.
     */
<<<<<<< HEAD
    public VCardComposer(Context context, int vcardType, boolean careHandlerErrors) {
        mContext = context;
        mVCardType = vcardType;
        mCareHandlerErrors = careHandlerErrors;
=======
    public VCardComposer(Context context, int vcardType, boolean careHandlerErrors,
            boolean isCallLogComposer, boolean needPhotoInVCard) {
        mContext = context;
        mVCardType = vcardType;
        mCareHandlerErrors = careHandlerErrors;
        mIsCallLogComposer = isCallLogComposer;
        mNeedPhotoForVCard = needPhotoInVCard;
>>>>>>> a229cedadd6c3b8ab7f2d8b7b45638753e834992
        mContentResolver = context.getContentResolver();

        mIsV30 = VCardConfig.isV30(vcardType);
Solution content 
    /**
     * Construct for supporting call log entry vCard composing.
     */
    public VCardComposer(Context context, int vcardType, boolean careHandlerErrors) {
        mContext = context;
        mVCardType = vcardType;
        mCareHandlerErrors = careHandlerErrors;
        mContentResolver = context.getContentResolver();

        mIsV30 = VCardConfig.isV30(vcardType);
File
VCardComposer.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method signature
Variable