Revert "IMS: Update VoLTE, VoWifi icons based on IMS capabilities"staging/cm-14.1-cafrebase

This reverts commit 7d0fa830874b20844d525218ce7bd54df8334566.

Change-Id: I5a816b254b2db1ea68ff955adc4c8d4f698717c2

1 files changed, 0 insertions, 17 deletions

diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index c874c2457..12f5d4e45 100644
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -1217,7 +1217,6 @@ public class ServiceStateTracker extends Handler {
             case EVENT_IMS_CAPABILITY_CHANGED:
                 if (DBG) log("EVENT_IMS_CAPABILITY_CHANGED");
                 updateSpnDisplay();
-                updateRilImsRadioTechnology();
                 break;
 
             //CDMA
@@ -2503,18 +2502,6 @@ public class ServiceStateTracker extends Handler {
         return mCi.getRadioState() == CommandsInterface.RadioState.RADIO_ON;
     }
 
-    private void updateRilImsRadioTechnology() {
-        int imsRadioTechnology = mPhone.getImsPhone() != null ?
-                mPhone.getImsPhone().getServiceState().getRilImsRadioTechnology() :
-                ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
-        if (imsRadioTechnology != mSS.getRilImsRadioTechnology()) {
-            Rlog.i(LOG_TAG, "updateRilImsRadioTechnology : Old ims RAT: " +
-                    mSS.getRilImsRadioTechnology() + " new ims RAT: " + imsRadioTechnology);
-            mSS.setRilImsRadioTechnology(imsRadioTechnology);
-            mPhone.notifyServiceStateChanged(mSS);
-        }
-    }
-
     /**
      * A complete "service state" from our perspective is
      * composed of a handful of separate requests to the radio.
@@ -2695,8 +2682,6 @@ public class ServiceStateTracker extends Handler {
             }
         }
 
-        // Ims call capable rat will be filled as part of service state changed.
-        mNewSS.setRilImsRadioTechnology(mSS.getRilImsRadioTechnology());
         // swap mSS and mNewSS to put new state in mSS
         ServiceState tss = mSS;
         mSS = mNewSS;
@@ -2939,8 +2924,6 @@ public class ServiceStateTracker extends Handler {
                     mNewSS.getVoiceRegState(), mNewSS.getDataRegState());
         }
 
-        // Ims call capable rat will be filled as part of service state changed.
-        mNewSS.setRilImsRadioTechnology(mSS.getRilImsRadioTechnology());
         ServiceState tss;
         tss = mSS;
         mSS = mNewSS;