Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f5201ab7: Keep original phone number in SipConnection.

Browse Source 
Merge commit 'f5201ab71ff4d104265ab126e86afc6b81da8011' into gingerbread-plus-aosp

* commit 'f5201ab71ff4d104265ab126e86afc6b81da8011':
  Keep original phone number in SipConnection.
This commit is contained in:
Hung-ying Tyan
2010-10-11 20:55:56 -07:00
committed by Android Git Automerger
parent b05632aae3 f5201ab71f
commit f5b7c855fb
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java
View File

@@ -56,8 +56,8 @@ abstract class SipConnectionBase extends Connection {
private DisconnectCause mCause = DisconnectCause.NOT_DISCONNECTED;
private PostDialState postDialState = PostDialState.NOT_STARTED;
SipConnectionBase(String calleeSipUri) {
dialString = calleeSipUri;
SipConnectionBase(String dialString) {
this.dialString = dialString;
postDialString = PhoneNumberUtils.extractPostDialPortion(dialString);

19
telephony/java/com/android/internal/telephony/sip/SipPhone.java
View File

@@ -387,7 +387,8 @@ public class SipPhone extends SipPhoneBase {
try {
SipProfile callee =
new SipProfile.Builder(calleeSipUri).build();
SipConnection c = new SipConnection(this, callee);
SipConnection c = new SipConnection(this, callee,
originalNumber);
connections.add(c);
c.dial();
setState(Call.State.DIALING);
@@ -578,6 +579,7 @@ public class SipPhone extends SipPhoneBase {
private SipAudioCall mSipAudioCall;
private Call.State mState = Call.State.IDLE;
private SipProfile mPeer;
private String mOriginalNumber; // may be a PSTN number
private boolean mIncoming = false;
private SipAudioCallAdapter mAdapter = new SipAudioCallAdapter() {
@@ -659,10 +661,16 @@ public class SipPhone extends SipPhoneBase {
}
};
public SipConnection(SipCall owner, SipProfile callee) {
super(getUriString(callee));
public SipConnection(SipCall owner, SipProfile callee,
String originalNumber) {
super(originalNumber);
mOwner = owner;
mPeer = callee;
mOriginalNumber = originalNumber;
}
public SipConnection(SipCall owner, SipProfile callee) {
this(owner, callee, getUriString(callee));
}
void initIncomingCall(SipAudioCall sipAudioCall, Call.State newState) {
@@ -735,7 +743,10 @@ public class SipPhone extends SipPhoneBase {
@Override
public String getAddress() {
return getUriString(mPeer);
// Phone app uses this to query caller ID. Return the original dial
// number (which may be a PSTN number) instead of the peer's SIP
// URI.
return mOriginalNumber;
}
@Override