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

Merge "Return display name in SipConnection.getCnapName()." into gingerbread

Browse Source
This commit is contained in:
Hung-ying Tyan
2010-10-19 23:00:16 -07:00
committed by Android (Google) Code Review
parent f4cd9be039 538e58fc75
commit b595e094e3
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import android.os.AsyncResult;
import android.os.Message; import android.os.Message;
import android.telephony.PhoneNumberUtils; import android.telephony.PhoneNumberUtils;
import android.telephony.ServiceState; import android.telephony.ServiceState;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.android.internal.telephony.Call; import com.android.internal.telephony.Call;
@@ -673,6 +674,18 @@ public class SipPhone extends SipPhoneBase {
this(owner, callee, getUriString(callee)); this(owner, callee, getUriString(callee));
} }
@Override
public String getCnapName() {
String displayName = mPeer.getDisplayName();
return TextUtils.isEmpty(displayName) ? null
: displayName;
}
@Override
public int getNumberPresentation() {
return Connection.PRESENTATION_ALLOWED;
}
void initIncomingCall(SipAudioCall sipAudioCall, Call.State newState) { void initIncomingCall(SipAudioCall sipAudioCall, Call.State newState) {
setState(newState); setState(newState);
mSipAudioCall = sipAudioCall; mSipAudioCall = sipAudioCall;