Merge "Telephony: Register/Unregister Phones with CallManager"

Author: cco3

telephony/java/com/android/internal/telephony/PhoneProxy.java

@@ -35,6 +35,7 @@
 import com.android.internal.telephony.gsm.UsimServiceTable;
 import com.android.internal.telephony.ims.IsimRecords;
 import com.android.internal.telephony.test.SimulatedRadioControl;
+import com.android.internal.telephony.CallManager;
 
 import java.util.List;
 
@@ -87,6 +88,7 @@ public void handleMessage(Message msg) {
 
             if(mOutgoingPhone.equals("GSM")) {
                 logd("Make a new CDMAPhone and destroy the old GSMPhone.");
+                CallManager.getInstance().unregisterPhone(mActivePhone);
 
                 ((GSMPhone)mActivePhone).dispose();
                 Phone oldPhone = mActivePhone;
@@ -99,9 +101,11 @@ public void handleMessage(Message msg) {
 
                 mActivePhone = PhoneFactory.getCdmaPhone();
                 ((GSMPhone)oldPhone).removeReferences();
+                CallManager.getInstance().registerPhone(mActivePhone);
                 oldPhone = null;
             } else {
                 logd("Make a new GSMPhone and destroy the old CDMAPhone.");
+                CallManager.getInstance().unregisterPhone(mActivePhone);
 
                 ((CDMAPhone)mActivePhone).dispose();
                 //mActivePhone = null;
@@ -115,6 +119,7 @@ public void handleMessage(Message msg) {
 
                 mActivePhone = PhoneFactory.getGsmPhone();
                 ((CDMAPhone)oldPhone).removeReferences();
+                CallManager.getInstance().registerPhone(mActivePhone);
                 oldPhone = null;
             }