Projects >> android-frameworks-base-with-screenshot-tweaks >>2874c3dec4f9ffd59b2be3de62c1148534396828

Chunk
Conflicting content 
        // TODO: add PRESENTATION_URL
        return Connection.PRESENTATION_ALLOWED;
    }
<<<<<<< HEAD

    @Override
    public UUSInfo getUUSInfo() {
        // FIXME: what's this for SIP?
        return null;
    }
=======
>>>>>>> 8788d140363ed921f49d366d67bd7164e63e54ae
}
Solution content 
        // TODO: add PRESENTATION_URL
        return Connection.PRESENTATION_ALLOWED;
    }

    @Override
    public UUSInfo getUUSInfo() {
        // FIXME: what's this for SIP?
        return null;
    }
}
File
SipConnectionBase.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
import com.android.internal.telephony.Connection;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneNotifier;
<<<<<<< HEAD
import com.android.internal.telephony.PhoneProxy;
import com.android.internal.telephony.PhoneSubInfo;
import com.android.internal.telephony.TelephonyProperties;
=======
import com.android.internal.telephony.UUSInfo;
>>>>>>> 8788d140363ed921f49d366d67bd7164e63e54ae

import java.text.ParseException;
import java.util.List;
Solution content 
import com.android.internal.telephony.Connection;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneNotifier;

import java.text.ParseException;
import java.util.List;
File
SipPhone.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
package com.android.internal.telephony.sip;

import android.content.Context;
<<<<<<< HEAD
import android.content.SharedPreferences;
import android.net.LinkProperties;
import android.net.Uri;
=======
>>>>>>> 8788d140363ed921f49d366d67bd7164e63e54ae
import android.os.AsyncResult;
import android.os.Handler;
import android.os.Message;
Solution content 
package com.android.internal.telephony.sip;

import android.content.Context;
import android.net.LinkProperties;
import android.os.AsyncResult;
import android.os.Handler;
import android.os.Message;
File
SipPhoneBase.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import com.android.internal.telephony.PhoneNotifier;
import com.android.internal.telephony.PhoneSubInfo;
import com.android.internal.telephony.TelephonyProperties;
<<<<<<< HEAD
import com.android.internal.telephony.UUSInfo;
=======
>>>>>>> 8788d140363ed921f49d366d67bd7164e63e54ae

import java.util.ArrayList;
import java.util.List;
Solution content 
import com.android.internal.telephony.PhoneNotifier;
import com.android.internal.telephony.PhoneSubInfo;
import com.android.internal.telephony.TelephonyProperties;
import com.android.internal.telephony.UUSInfo;

import java.util.ArrayList;
import java.util.List;
File
SipPhoneBase.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    public abstract Call getRingingCall();

<<<<<<< HEAD
    public Connection dial(String dialString, UUSInfo uusInfo)
            throws CallStateException {
        // ignore UUSInfo
        return dial(dialString);
    }

=======
>>>>>>> 8788d140363ed921f49d366d67bd7164e63e54ae
    void migrateFrom(SipPhoneBase from) {
        migrate(mRingbackRegistrants, from.mRingbackRegistrants);
        migrate(mPreciseCallStateRegistrants, from.mPreciseCallStateRegistrants);
Solution content 
    public abstract Call getRingingCall();

    public Connection dial(String dialString, UUSInfo uusInfo)
            throws CallStateException {
        // ignore UUSInfo
        return dial(dialString);
    }

    void migrateFrom(SipPhoneBase from) {
        migrate(mRingbackRegistrants, from.mRingbackRegistrants);
        migrate(mPreciseCallStateRegistrants, from.mPreciseCallStateRegistrants);
File
SipPhoneBase.java
Developer's decision
Version 1
Kind of conflict
Method declaration