Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Telephony: Move Cat to IccCard

Browse Source 
Change-Id: Ibbea7b8f277f33e71580d61f83645b0aaefef580
This commit is contained in:
Alex Yakavenka
2011-12-09 14:34:56 -08:00
committed by Wink Saville
parent d5c88b51f7
commit ce2dcb6f13
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/com/android/internal/telephony/IccCard.java
View File

@@ -37,6 +37,7 @@ import com.android.internal.telephony.PhoneBase;
import com.android.internal.telephony.CommandsInterface.RadioState;
import com.android.internal.telephony.gsm.SIMFileHandler;
import com.android.internal.telephony.gsm.SIMRecords;
import com.android.internal.telephony.cat.CatService;
import com.android.internal.telephony.cdma.CDMALTEPhone;
import com.android.internal.telephony.cdma.CdmaLteUiccFileHandler;
import com.android.internal.telephony.cdma.CdmaLteUiccRecords;
@@ -65,6 +66,8 @@ public class IccCard {
protected PhoneBase mPhone;
private IccRecords mIccRecords;
private IccFileHandler mIccFileHandler;
private CatService mCatService;
private RegistrantList mAbsentRegistrants = new RegistrantList();
private RegistrantList mPinLockedRegistrants = new RegistrantList();
private RegistrantList mNetworkLockedRegistrants = new RegistrantList();
@@ -194,6 +197,8 @@ public class IccCard {
mIccRecords = is3gpp ? new SIMRecords(this, mPhone.mContext, mPhone.mCM) :
new RuimRecords(this, mPhone.mContext, mPhone.mCM);
}
mCatService = CatService.getInstance(mPhone.mCM, mIccRecords,
mPhone.mContext, mIccFileHandler, this);
mPhone.mCM.registerForOffOrNotAvailable(mHandler, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null);
mPhone.mCM.registerForOn(mHandler, EVENT_RADIO_ON, null);
mPhone.mCM.registerForIccStatusChanged(mHandler, EVENT_ICC_STATUS_CHANGED, null);
@@ -204,6 +209,7 @@ public class IccCard {
mPhone.mCM.unregisterForIccStatusChanged(mHandler);
mPhone.mCM.unregisterForOffOrNotAvailable(mHandler);
mPhone.mCM.unregisterForOn(mHandler);
mCatService.dispose();
mCdmaSSM.dispose(mHandler);
mIccRecords.dispose();
mIccFileHandler.dispose();

7
telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
View File

@@ -103,7 +103,6 @@ public class CDMAPhone extends PhoneBase {
PhoneSubInfo mSubInfo;
EriManager mEriManager;
WakeLock mWakeLock;
CatService mCcatService;
// mEriFileLoadedRegistrants are informed after the ERI text has been loaded
private final RegistrantList mEriFileLoadedRegistrants = new RegistrantList();
@@ -169,8 +168,6 @@ public class CDMAPhone extends PhoneBase {
mRuimSmsInterfaceManager = new RuimSmsInterfaceManager(this, mSMS);
mSubInfo = new PhoneSubInfo(this);
mEriManager = new EriManager(this, context, EriManager.ERI_FROM_XML);
mCcatService = CatService.getInstance(mCM, mIccRecords, mContext,
mIccFileHandler, mIccCard);
mCM.registerForAvailable(this, EVENT_RADIO_AVAILABLE, null);
registerForRuimRecordEvents();
@@ -245,14 +242,12 @@ public class CDMAPhone extends PhoneBase {
mRuimSmsInterfaceManager.dispose();
mSubInfo.dispose();
mEriManager.dispose();
mCcatService.dispose();
}
}
@Override
public void removeReferences() {
log("removeReferences");
super.removeReferences();
mRuimPhoneBookInterfaceManager = null;
mRuimSmsInterfaceManager = null;
mSubInfo = null;
@@ -260,8 +255,8 @@ public class CDMAPhone extends PhoneBase {
mCT = null;
mSST = null;
mEriManager = null;
mCcatService = null;
mExitEcmRunnable = null;
super.removeReferences();
}
@Override

6
telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
View File

@@ -101,7 +101,6 @@ public class GSMPhone extends PhoneBase {
// Instance Variables
GsmCallTracker mCT;
GsmServiceStateTracker mSST;
CatService mStkService;
ArrayList <GsmMmiCode> mPendingMMIs = new ArrayList<GsmMmiCode>();
SimPhoneBookInterfaceManager mSimPhoneBookIntManager;
SimSmsInterfaceManager mSimSmsIntManager;
@@ -149,7 +148,6 @@ public class GSMPhone extends PhoneBase {
mSimSmsIntManager = new SimSmsInterfaceManager(this, mSMS);
mSubInfo = new PhoneSubInfo(this);
}
mStkService = CatService.getInstance(mCM, mIccRecords, mContext, mIccFileHandler, mIccCard);
mCM.registerForAvailable(this, EVENT_RADIO_AVAILABLE, null);
registerForSimRecordEvents();
@@ -215,7 +213,6 @@ public class GSMPhone extends PhoneBase {
mPendingMMIs.clear();
//Force all referenced classes to unregister their former registered events
mStkService.dispose();
mCT.dispose();
mDataConnectionTracker.dispose();
mSST.dispose();
@@ -228,15 +225,14 @@ public class GSMPhone extends PhoneBase {
@Override
public void removeReferences() {
Log.d(LOG_TAG, "removeReferences");
super.removeReferences();
mSimulatedRadioControl = null;
mStkService = null;
mSimPhoneBookIntManager = null;
mSimSmsIntManager = null;
mSubInfo = null;
mIccFileHandler = null;
mCT = null;
mSST = null;
super.removeReferences();
}
protected void finalize() {