Projects >> platform_packages_apps_mms >>fbec98191bfceb6915b39cd267961a74a9a42880

Chunk
Conflicting content
        // Get ready to write to disk.
        prepareForSave(true /* notify */);

<<<<<<< HEAD
=======
        // Begin -------- debug code
        String newRecipients = mConversation.getRecipients().serialize();
        if (!TextUtils.isEmpty(recipientsInUI) && !newRecipients.equals(recipientsInUI)) {
            if (LogTag.SEVERE_WARNING) {
                LogTag.showWarningDialog("send() after newRecipients() changed recips from: "
                        + recipientsInUI + " to " + newRecipients, mActivity);
                dumpWorkingRecipients();
            } else {
                Log.w(TAG, "send() after newRecipients() changed recips from: "
                        + recipientsInUI + " to " + newRecipients);
            }
        }
        // End -------- debug code

>>>>>>> ec1a03a528fecd27e2f151ab6ff91ca7ce775059
        // We need the recipient list for both SMS and MMS.
        final Conversation conv = mConversation;
        String msgTxt = mText.toString();
Solution content
        // Get ready to write to disk.
        prepareForSave(true /* notify */);

        // We need the recipient list for both SMS and MMS.
        final Conversation conv = mConversation;
        String msgTxt = mText.toString();
File
WorkingMessage.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Variable