Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e00a8d5 authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android Git Automerger
Browse files

am e894ff7a: am b595e094: Merge "Return display name in... 

am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread

Merge commit 'e894ff7a'

* commit 'e894ff7a':
  Return display name in SipConnection.getCnapName().
parents 0d4e658b e894ff7a

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

+13 −0
Original line number Original line Diff line number Diff line
@@ -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;
@@ -676,6 +677,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;