Revert "IMS: Update VoLTE, VoWifi icons based on IMS capabilities" (4a9f49f7) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/Phone.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -3271,20 +3271,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		return false;
		}

		/**
		* Determines if video wifi calling enabled for the phone
		*
		* @return {@code true} if video wifi calling is enabled, {@code false} otherwise.
		*/
		public boolean isVideoWifiCallingEnabled() {
		Phone imsPhone = mImsPhone;
		if ((imsPhone != null)
		&& (imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE)) {
		return imsPhone.isVideoWifiCallingEnabled();
		}
		return false;
		}

		/**
		* Returns the status of Link Capacity Estimation (LCE) service.
		*/

src/java/com/android/internal/telephony/ServiceStateTracker.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -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;

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -1485,10 +1485,6 @@ public class ImsPhone extends ImsPhoneBase {
		return mCT.isVideoCallEnabled();
		}

		public boolean isVideoWifiCallingEnabled() {
		return mCT.isVideoWifiCallingEnabled();
		}

		@Override
		public Phone getDefaultPhone() {
		return mDefaultPhone;

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+1 −17

Original line number	Diff line number	Diff line
		@@ -2271,7 +2271,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		for (ImsPhoneConnection connection : mConnections) {
		connection.updateWifiState();
		}
		mPhone.getServiceState().setRilImsRadioTechnology(getRilImsRadioTechnology());

		mPhone.onFeatureCapabilityChanged();

		mMetrics.writeOnImsCapabilities(
		@@ -2604,22 +2604,6 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		\|\| mImsFeatureEnabled[ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_WIFI]);
		}

		public boolean isVideoWifiCallingEnabled() {
		return mImsFeatureEnabled[ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_WIFI];
		}

		private int getRilImsRadioTechnology() {
		int imsRadioTechnology = ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
		if (mImsFeatureEnabled[ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_LTE]
		\|\| mImsFeatureEnabled[ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_LTE]) {
		imsRadioTechnology = ServiceState.RIL_RADIO_TECHNOLOGY_LTE;
		} else if (mImsFeatureEnabled[ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_WIFI]
		\|\| mImsFeatureEnabled[ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_WIFI]) {
		imsRadioTechnology = ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;
		}
		return imsRadioTechnology;
		}

		@Override
		public PhoneConstants.State getState() {
		return mState;