Skip to content

Commit 3558486

Browse files
Wink SavilleAndroid (Google) Code Review
authored andcommitted
Merge "Telephony: Move Cat to IccCard"
2 parents dee7e2a + ce2dcb6 commit 3558486

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

telephony/java/com/android/internal/telephony/IccCard.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.android.internal.telephony.CommandsInterface.RadioState;
3838
import com.android.internal.telephony.gsm.SIMFileHandler;
3939
import com.android.internal.telephony.gsm.SIMRecords;
40+
import com.android.internal.telephony.cat.CatService;
4041
import com.android.internal.telephony.cdma.CDMALTEPhone;
4142
import com.android.internal.telephony.cdma.CdmaLteUiccFileHandler;
4243
import com.android.internal.telephony.cdma.CdmaLteUiccRecords;
@@ -65,6 +66,8 @@ public class IccCard {
6566
protected PhoneBase mPhone;
6667
private IccRecords mIccRecords;
6768
private IccFileHandler mIccFileHandler;
69+
private CatService mCatService;
70+
6871
private RegistrantList mAbsentRegistrants = new RegistrantList();
6972
private RegistrantList mPinLockedRegistrants = new RegistrantList();
7073
private RegistrantList mNetworkLockedRegistrants = new RegistrantList();
@@ -194,6 +197,8 @@ public IccCard(PhoneBase phone, String logTag, Boolean is3gpp, Boolean dbg) {
194197
mIccRecords = is3gpp ? new SIMRecords(this, mPhone.mContext, mPhone.mCM) :
195198
new RuimRecords(this, mPhone.mContext, mPhone.mCM);
196199
}
200+
mCatService = CatService.getInstance(mPhone.mCM, mIccRecords,
201+
mPhone.mContext, mIccFileHandler, this);
197202
mPhone.mCM.registerForOffOrNotAvailable(mHandler, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null);
198203
mPhone.mCM.registerForOn(mHandler, EVENT_RADIO_ON, null);
199204
mPhone.mCM.registerForIccStatusChanged(mHandler, EVENT_ICC_STATUS_CHANGED, null);
@@ -204,6 +209,7 @@ public void dispose() {
204209
mPhone.mCM.unregisterForIccStatusChanged(mHandler);
205210
mPhone.mCM.unregisterForOffOrNotAvailable(mHandler);
206211
mPhone.mCM.unregisterForOn(mHandler);
212+
mCatService.dispose();
207213
mCdmaSSM.dispose(mHandler);
208214
mIccRecords.dispose();
209215
mIccFileHandler.dispose();

telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ public class CDMAPhone extends PhoneBase {
103103
PhoneSubInfo mSubInfo;
104104
EriManager mEriManager;
105105
WakeLock mWakeLock;
106-
CatService mCcatService;
107106

108107
// mEriFileLoadedRegistrants are informed after the ERI text has been loaded
109108
private final RegistrantList mEriFileLoadedRegistrants = new RegistrantList();
@@ -169,8 +168,6 @@ protected void init(Context context, PhoneNotifier notifier) {
169168
mRuimSmsInterfaceManager = new RuimSmsInterfaceManager(this, mSMS);
170169
mSubInfo = new PhoneSubInfo(this);
171170
mEriManager = new EriManager(this, context, EriManager.ERI_FROM_XML);
172-
mCcatService = CatService.getInstance(mCM, mIccRecords, mContext,
173-
mIccFileHandler, mIccCard);
174171

175172
mCM.registerForAvailable(this, EVENT_RADIO_AVAILABLE, null);
176173
registerForRuimRecordEvents();
@@ -245,23 +242,21 @@ public void dispose() {
245242
mRuimSmsInterfaceManager.dispose();
246243
mSubInfo.dispose();
247244
mEriManager.dispose();
248-
mCcatService.dispose();
249245
}
250246
}
251247

252248
@Override
253249
public void removeReferences() {
254250
log("removeReferences");
255-
super.removeReferences();
256251
mRuimPhoneBookInterfaceManager = null;
257252
mRuimSmsInterfaceManager = null;
258253
mSubInfo = null;
259254
mIccFileHandler = null;
260255
mCT = null;
261256
mSST = null;
262257
mEriManager = null;
263-
mCcatService = null;
264258
mExitEcmRunnable = null;
259+
super.removeReferences();
265260
}
266261

267262
@Override

telephony/java/com/android/internal/telephony/gsm/GSMPhone.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ public class GSMPhone extends PhoneBase {
101101
// Instance Variables
102102
GsmCallTracker mCT;
103103
GsmServiceStateTracker mSST;
104-
CatService mStkService;
105104
ArrayList <GsmMmiCode> mPendingMMIs = new ArrayList<GsmMmiCode>();
106105
SimPhoneBookInterfaceManager mSimPhoneBookIntManager;
107106
SimSmsInterfaceManager mSimSmsIntManager;
@@ -149,7 +148,6 @@ public class GSMPhone extends PhoneBase {
149148
mSimSmsIntManager = new SimSmsInterfaceManager(this, mSMS);
150149
mSubInfo = new PhoneSubInfo(this);
151150
}
152-
mStkService = CatService.getInstance(mCM, mIccRecords, mContext, mIccFileHandler, mIccCard);
153151

154152
mCM.registerForAvailable(this, EVENT_RADIO_AVAILABLE, null);
155153
registerForSimRecordEvents();
@@ -215,7 +213,6 @@ public void dispose() {
215213
mPendingMMIs.clear();
216214

217215
//Force all referenced classes to unregister their former registered events
218-
mStkService.dispose();
219216
mCT.dispose();
220217
mDataConnectionTracker.dispose();
221218
mSST.dispose();
@@ -228,15 +225,14 @@ public void dispose() {
228225
@Override
229226
public void removeReferences() {
230227
Log.d(LOG_TAG, "removeReferences");
231-
super.removeReferences();
232228
mSimulatedRadioControl = null;
233-
mStkService = null;
234229
mSimPhoneBookIntManager = null;
235230
mSimSmsIntManager = null;
236231
mSubInfo = null;
237232
mIccFileHandler = null;
238233
mCT = null;
239234
mSST = null;
235+
super.removeReferences();
240236
}
241237

242238
protected void finalize() {

0 commit comments

Comments
 (0)