Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee50eec0 authored by Conley Owens's avatar Conley Owens Committed by Android Git Automerger
Browse files

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

* commit 'a10cc893':
  Revert "Telephony: Register/Unregister Phones with CallManager"
parents 356ca03c a10cc893

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

+0 −5
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.internal.telephony.gsm.GSMPhone; 
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 @@ 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;
@@ -101,11 +99,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;
@@ -119,7 +115,6 @@ public class PhoneProxy extends Handler implements Phone { 


                mActivePhone = PhoneFactory.getGsmPhone();

                ((CDMAPhone)oldPhone).removeReferences();

                CallManager.getInstance().registerPhone(mActivePhone);

                oldPhone = null;

            }