From 75acebd02d2b3478d98cc8da98fa9229c53c32d5 Mon Sep 17 00:00:00 2001
From: Ramesh Sudini <ramesh.sudini@motorola.com>
Date: Fri, 4 Mar 2011 10:01:06 -0600
Subject: [PATCH] Do not merge: LTE: Fix SST for CDMALTEPhone.

Change-Id: I4dc3d3bb4dba968694a5856624448b7ba1e35601
---
 .../com/android/internal/telephony/cdma/CDMALTEPhone.java | 7 +++++--
 .../com/android/internal/telephony/cdma/CDMAPhone.java    | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
index 300670f84cc77..89d7174fe14ff 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
@@ -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();
diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
index 3772dacb62c57..dd5091cb22f27 100755
--- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
@@ -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);