Do not merge: LTE: Fix SST for CDMALTEPhone. (75acebd0) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -54,13 +54,16 @@ public class CDMALTEPhone extends CDMAPhone {
		public CDMALTEPhone(Context context, CommandsInterface ci, PhoneNotifier notifier,
		boolean unitTestMode) {
		super(context, ci, notifier, false);
		mSST = new CdmaLteServiceStateTracker(this);
		init(context, notifier);

		mSIMRecords = new SIMRecords(this);
		mSimCard = new SimCard(this, LOG_TAG, DBG);
		}

		@Override
		protected void initSST() {
		mSST = new CdmaLteServiceStateTracker(this);
		}

		public void dispose() {
		synchronized (PhoneProxy.lockForRadioTechnologyChange) {
		super.dispose();

+6 −2

Original line number	Diff line number	Diff line
		@@ -142,17 +142,21 @@ public class CDMAPhone extends PhoneBase {
		// Constructors
		public CDMAPhone(Context context, CommandsInterface ci, PhoneNotifier notifier) {
		super(notifier, context, ci, false);
		mSST = new CdmaServiceStateTracker (this);
		initSST();
		init(context, notifier);
		}

		public CDMAPhone(Context context, CommandsInterface ci, PhoneNotifier notifier,
		boolean unitTestMode) {
		super(notifier, context, ci, unitTestMode);
		mSST = new CdmaServiceStateTracker (this);
		initSST();
		init(context, notifier);
		}

		protected void initSST() {
		mSST = new CdmaServiceStateTracker(this);
		}

		protected void init(Context context, PhoneNotifier notifier) {
		mCM.setPhoneType(Phone.PHONE_TYPE_CDMA);
		mCT = new CdmaCallTracker(this);