Projects >> android_frameworks_base >>b6bf10e4bd2c17838a00091c3b8efb2f91ce3457

Chunk
Conflicting content 
    protected boolean mStorageAvailable = true;
    protected boolean mReportMemoryStatusPending = false;

<<<<<<< HEAD
    /* Flags indicating whether the current device allows sms service */
    protected boolean mSmsCapable = true;
    protected boolean mSmsReceiveDisabled;
    protected boolean mSmsSendDisabled;
=======
    protected static int mRemainingMessages = -1;
>>>>>>> 917d9ea1ebec4d61f9de585d83debcf2cb2873dd

    protected static int getNextConcatenatedRef() {
        sConcatenatedRef += 1;
Solution content 
    protected boolean mStorageAvailable = true;
    protected boolean mReportMemoryStatusPending = false;

    /* Flags indicating whether the current device allows sms service */
    protected boolean mSmsCapable = true;
    protected boolean mSmsReceiveDisabled;
    protected boolean mSmsSendDisabled;

    protected static int mRemainingMessages = -1;

    protected static int getNextConcatenatedRef() {
        sConcatenatedRef += 1;
File
SMSDispatcher.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Comment