commit b595e094e3901ff8a224eaf7d4869e7d2e5649dd
author Hung-ying Tyan <tyanh@google.com> Tue Oct 19 23:00:16 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 19 23:00:16 2010 -0700
tree 9234a77ee64705bf5482d8cb708e63a90f252bfa
parent f4cd9be0390135269e22e42fd2e1fe61fdcf9863
parent 538e58fc757b0d10672235bc17b1380854845139

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

telephony/java/com/android/internal/telephony/sip/SipPhone.java

diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
index 1968552..b9a2e60 100755
--- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
@@ -28,6 +28,7 @@
 import android.os.Message;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.ServiceState;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.telephony.Call;
@@ -673,6 +674,18 @@
             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) {
             setState(newState);
             mSipAudioCall = sipAudioCall;