drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6a1dca3e: Merge "Telephony: Register/Unregister Phones with CallManager"

Browse Source 
* commit '6a1dca3e1c863a3d2db654a1b9fb7156fb3da00d':
  Telephony: Register/Unregister Phones with CallManager
This commit is contained in:
Conley Owens
2012-05-04 18:13:17 -07:00
committed by Android Git Automerger
parent acb5f383ea 6a1dca3e1c
commit 356ca03c10
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/com/android/internal/telephony/PhoneProxy.java
View File

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