commit f41783220aa8cc2e0e62c2ae2c3300b779c96101
author Tyler Gunn <tgunn@google.com> Wed Jun 29 07:51:50 2016 -0700
committer Tyler Gunn <tgunn@google.com> Wed Jun 29 07:51:50 2016 -0700
tree 2c071f72f64a4ee9bec7727a1a47df8f2b3396e0
parent 4866c6d44aa2a945737444b4a3b01332233ab2c4

Label dialog event package entries for conferences.

Dialog event package entries (multiendpoint) for a conference call on
another device will have a uri something like this:
sip:conf=2001-4888-205-710f-e0-113-0-120-1466524732857069@[2001

This ends up looking nasty in the UI.  To prevent this, adding code to
detect this type of URI and set the caller name to "Conference Call",
and blank out the caller number.

See bug for screenshot.

Bug: 29534470
Change-Id: I892897ca80347f57497928cb1b02fba83c3c664a

src/java/com/android/internal/telephony/imsphone/ImsExternalConnection.java

diff --git a/src/java/com/android/internal/telephony/imsphone/ImsExternalConnection.java b/src/java/com/android/internal/telephony/imsphone/ImsExternalConnection.java
index d0b9ece..071aebb 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsExternalConnection.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsExternalConnection.java
@@ -16,6 +16,7 @@
 
 package com.android.internal.telephony.imsphone;
 
+import com.android.internal.R;
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.Connection;
@@ -23,7 +24,9 @@
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.UUSInfo;
 
+import android.content.Context;
 import android.net.Uri;
+import android.telecom.PhoneAccount;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.Rlog;
 import android.util.Log;
@@ -45,6 +48,9 @@
  */
 public class ImsExternalConnection extends Connection {
 
+    private static final String CONFERENCE_PREFIX = "conf";
+    private final Context mContext;
+
     public interface Listener {
         void onPullExternalCall(ImsExternalConnection connection);
     }
@@ -79,6 +85,7 @@
 
     protected ImsExternalConnection(Phone phone, int callId, Uri address, boolean isPullable) {
         super(phone.getPhoneType());
+        mContext = phone.getContext();
         mCall = new ImsExternalCall(phone, this);
         mCallId = callId;
         setExternalConnectionAddress(address);
@@ -215,6 +222,15 @@
     public void setExternalConnectionAddress(Uri address) {
         mOriginalAddress = address;
 
+        if (PhoneAccount.SCHEME_SIP.equals(address.getScheme())) {
+            if (address.getSchemeSpecificPart().startsWith(CONFERENCE_PREFIX)) {
+                mCnapName = mContext.getString(com.android.internal.R.string.conference_call);
+                mCnapNamePresentation = PhoneConstants.PRESENTATION_ALLOWED;
+                mAddress = "";
+                mNumberPresentation = PhoneConstants.PRESENTATION_RESTRICTED;
+                return;
+            }
+        }
         Uri telUri = PhoneNumberUtils.convertSipUriToTelUri(address);
         mAddress = telUri.getSchemeSpecificPart();
     }