Projects >> android-frameworks-base-with-remote-control-service >>a774f5817b5a24f5ccbb15c97fc4d5038310245b

Chunk
Conflicting content 
    /**
     * Calculate the message text encoding length, fragmentation, and other details.
     *
<<<<<<< HEAD
=======
     * @param msg message text
>>>>>>> 31202b1a40e7daccf69e284492494f9ff739f324
     * @param force7BitEncoding ignore (but still count) illegal characters if true
     * @return septet count, or -1 on failure
     */
Solution content 
    /**
     * Calculate the message text encoding length, fragmentation, and other details.
     *
     * @param msg message text
     * @param force7BitEncoding ignore (but still count) illegal characters if true
     * @return septet count, or -1 on failure
     */
File
BearerData.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
     * (See 3GPP2 C.R1001-F, v1.0, section 4.5 for layout details)
     *
     * @param bData an instance of BearerData.
<<<<<<< HEAD
     *
     * @return data byte array of raw encoded SMS bearer data.
=======
     * @return byte array of raw encoded SMS bearer data.
>>>>>>> 31202b1a40e7daccf69e284492494f9ff739f324
     */
    public static byte[] encode(BearerData bData) {
        bData.hasUserDataHeader = ((bData.userData != null) &&
Solution content 
     * (See 3GPP2 C.R1001-F, v1.0, section 4.5 for layout details)
     *
     * @param bData an instance of BearerData.
     *
     * @return byte array of raw encoded SMS bearer data.
     */
    public static byte[] encode(BearerData bData) {
        bData.hasUserDataHeader = ((bData.userData != null) &&
File
BearerData.java
Developer's decision
Combination
Kind of conflict
Comment