Merge "Repoint Ims.IsAvailability from tele-cache to ImsService" into rvc-dev am: 4c62f483ba (bf48cd4e) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ import android.util.SparseArray;

		import com.android.ims.ImsCall;
		import com.android.ims.ImsConfig;
		import com.android.ims.ImsException;
		import com.android.ims.ImsManager;
		import com.android.internal.R;
		import com.android.internal.annotations.VisibleForTesting;
		@@ -3693,7 +3694,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @return true if the IMS capability for the registration technology specified is available,
		* false otherwise.
		*/
		public boolean isImsCapabilityAvailable(int capability, int regTech) {
		public boolean isImsCapabilityAvailable(int capability, int regTech) throws ImsException {
		Phone imsPhone = mImsPhone;
		boolean isAvailable = false;
		if (imsPhone != null) {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1782,7 +1782,7 @@ public class ImsPhone extends ImsPhoneBase {
		}

		@Override
		public boolean isImsCapabilityAvailable(int capability, int regTech) {
		public boolean isImsCapabilityAvailable(int capability, int regTech) throws ImsException {
		return mCT.isImsCapabilityAvailable(capability, regTech);
		}

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

+13 −4

Original line number	Diff line number	Diff line
		@@ -4205,20 +4205,25 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		}

		/**
		* Contacts the ImsService directly for capability information. May be slow.
		* @return true if the IMS capability for the specified registration technology is currently
		* available.
		*/
		public boolean isImsCapabilityAvailable(int capability, int regTech) {
		return (getImsRegistrationTech() == regTech) && mMmTelCapabilities.isCapable(capability);
		public boolean isImsCapabilityAvailable(int capability, int regTech) throws ImsException {
		if (mImsManager != null) {
		return mImsManager.queryMmTelCapabilityStatus(capability, regTech);
		} else {
		return false;
		}
		}

		public boolean isVolteEnabled() {
		return isImsCapabilityAvailable(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
		return isImsCapabilityInCacheAvailable(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
		ImsRegistrationImplBase.REGISTRATION_TECH_LTE);
		}

		public boolean isVowifiEnabled() {
		return isImsCapabilityAvailable(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
		return isImsCapabilityInCacheAvailable(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
		ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN);
		}

		@@ -4227,6 +4232,10 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		return mMmTelCapabilities.isCapable(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VIDEO);
		}

		private boolean isImsCapabilityInCacheAvailable(int capability, int regTech) {
		return (getImsRegistrationTech() == regTech) && mMmTelCapabilities.isCapable(capability);
		}

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