foo.diff

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 96a48b9..e908bf2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -414,6 +414,14 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="CellBroadcastSms"
+            android:label="@string/cell_broadcast_sms"
+            android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
         <!-- fdn setting -->
         <activity android:name="com.android.phone.settings.fdn.FdnSetting"
                 android:label="@string/fdn"
diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index 840c56e..d23f1df 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -351,8 +351,7 @@ public class ImsConference extends Conference {
         setConferenceHost(conferenceHost);
 
         int capabilities = Connection.CAPABILITY_MUTE |
-                Connection.CAPABILITY_CONFERENCE_HAS_NO_CHILDREN |
-                Connection.CAPABILITY_ADD_PARTICIPANT;
+                Connection.CAPABILITY_CONFERENCE_HAS_NO_CHILDREN;
         if (canHoldImsCalls()) {
             capabilities |= Connection.CAPABILITY_SUPPORT_HOLD | Connection.CAPABILITY_HOLD;
         }
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 11747e7..6b3adb7 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -744,13 +744,11 @@ public class TelephonyConnectionService extends ConnectionService {
 
         com.android.internal.telephony.Connection originalConnection = null;
         try {
-            if (phone != null) {
-                if (isAddParticipant) {
-                    phone.addParticipant(number);
-                    return;
-                } else {
-                    originalConnection = phone.dial(number, null, videoState, extras);
-                }
+            if (isAddParticipant) {
+                phone.addParticipant(number);
+                return;
+            } else if (phone != null) {
+                originalConnection = phone.dial(number, null, videoState, extras);
             }
         } catch (CallStateException e) {
             Log.e(this, e, "placeOutgoingConnection, phone.dial exception: " + e);