From 6a0f525a16447485720305b52441c9a1b99b8e1a Mon Sep 17 00:00:00 2001 From: Conley Owens Date: Fri, 4 May 2012 17:41:32 -0700 Subject: [PATCH] Revert "Telephony: Register/Unregister Phones with CallManager" This reverts commit cbca38522ca90322cfc9ccbb7872586807bf6c48 --- .../java/com/android/internal/telephony/PhoneProxy.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/telephony/java/com/android/internal/telephony/PhoneProxy.java b/telephony/java/com/android/internal/telephony/PhoneProxy.java index e1892ee531fcc..77f1e6c855e1b 100644 --- a/telephony/java/com/android/internal/telephony/PhoneProxy.java +++ b/telephony/java/com/android/internal/telephony/PhoneProxy.java @@ -36,7 +36,6 @@ import com.android.internal.telephony.gsm.GSMPhone; import com.android.internal.telephony.gsm.NetworkInfo; import com.android.internal.telephony.gsm.GsmDataConnection; import com.android.internal.telephony.test.SimulatedRadioControl; -import com.android.internal.telephony.CallManager; import java.util.List; @@ -89,7 +88,6 @@ public class PhoneProxy extends Handler implements Phone { if(mOutgoingPhone.equals("GSM")) { logd("Make a new CDMAPhone and destroy the old GSMPhone."); - CallManager.getInstance().unregisterPhone(mActivePhone); ((GSMPhone)mActivePhone).dispose(); Phone oldPhone = mActivePhone; @@ -102,11 +100,9 @@ public class PhoneProxy extends Handler implements Phone { 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; @@ -120,7 +116,6 @@ public class PhoneProxy extends Handler implements Phone { mActivePhone = PhoneFactory.getGsmPhone(); ((CDMAPhone)oldPhone).removeReferences(); - CallManager.getInstance().registerPhone(mActivePhone); oldPhone = null; }