commit a10cc893f7e1f21783ea60c50a49401181611027
author Conley Owens <cco3@android.com> Fri May 04 17:56:13 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Fri May 04 17:56:14 2012 -0700
tree f08270a8746b7c5260cd887689467a1e4f190422
parent 6a1dca3e1c863a3d2db654a1b9fb7156fb3da00d
parent 6a0f525a16447485720305b52441c9a1b99b8e1a

Merge "Revert "Telephony: Register/Unregister Phones with CallManager""

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

diff --git a/telephony/java/com/android/internal/telephony/PhoneProxy.java b/telephony/java/com/android/internal/telephony/PhoneProxy.java
index 7c213f7..60f364e 100644
--- a/telephony/java/com/android/internal/telephony/PhoneProxy.java
+++ b/telephony/java/com/android/internal/telephony/PhoneProxy.java
@@ -35,7 +35,6 @@
 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;
 
@@ -88,7 +87,6 @@
 
             if(mOutgoingPhone.equals("GSM")) {
                 logd("Make a new CDMAPhone and destroy the old GSMPhone.");
-                CallManager.getInstance().unregisterPhone(mActivePhone);
 
                 ((GSMPhone)mActivePhone).dispose();
                 Phone oldPhone = mActivePhone;
@@ -101,11 +99,9 @@
 
                 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;
@@ -119,7 +115,6 @@
 
                 mActivePhone = PhoneFactory.getGsmPhone();
                 ((CDMAPhone)oldPhone).removeReferences();
-                CallManager.getInstance().registerPhone(mActivePhone);
                 oldPhone = null;
             }