Projects >> platform_frameworks_base >>284d6b627caac0bb290db25bc36186ce9ae7f3bb

Chunk
Conflicting content 
        Registrant r = new Registrant(h, what, obj);
        mDetachedRegistrants.add(r);

<<<<<<< HEAD
        if (getCurrentDataConnectionState() != ServiceState.STATE_IN_SERVICE) {
=======
        if (getCurrentDataConnectionState() == ServiceState.STATE_OUT_OF_SERVICE) {
>>>>>>> e1a500777d2c7e2211e6a41f69e63d1b61ec97af
            r.notifyRegistrant();
        }
    }
Solution content 
        Registrant r = new Registrant(h, what, obj);
        mDetachedRegistrants.add(r);

        if (getCurrentDataConnectionState() != ServiceState.STATE_IN_SERVICE) {
            r.notifyRegistrant();
        }
    }
File
ServiceStateTracker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
        }

>>>>>>> e1a500777d2c7e2211e6a41f69e63d1b61ec97af
        if (hasCdmaDataConnectionAttached) {
<<<<<<< HEAD
=======
            cdmaDataConnectionAttachedRegistrants.notifyRegistrants();
            mAttachedRegistrants.notifyRegistrants();
        }
Solution content 
        }

        if (hasCdmaDataConnectionAttached) {
            mAttachedRegistrants.notifyRegistrants();
        }
File
CdmaLteServiceStateTracker.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        }

        if (hasCdmaDataConnectionDetached) {
<<<<<<< HEAD
=======
            cdmaDataConnectionDetachedRegistrants.notifyRegistrants();
>>>>>>> e1a500777d2c7e2211e6a41f69e63d1b61ec97af
            mDetachedRegistrants.notifyRegistrants();
        }
Solution content 
        }

        if (hasCdmaDataConnectionDetached) {
            mDetachedRegistrants.notifyRegistrants();
        }
File
CdmaLteServiceStateTracker.java
Developer's decision
Version 1
Kind of conflict
Method invocation