Merge "Get IMS reg and SMS format from IMS Service instead" am: 6d621a8e5d am: 5aff7d444d (70f0a77f) · Commits · e / os / android_frameworks_opt_telephony

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

+15 −3

Original line number	Diff line number	Diff line
		@@ -510,12 +510,24 @@ public class SmsDispatchersController extends Handler {
		dispatcher.sendSms(tracker);
		}

		/**
		* SMS over IMS is supported if IMS is registered and SMS is supported on IMS.
		*
		* @return true if SMS over IMS is supported via an IMS Service or mIms is true for the older
		* implementation. Otherwise, false.
		*/
		public boolean isIms() {
		return mIms;
		return mImsSmsDispatcher.isAvailable() ? true : mIms;
		}

		/**
		* Gets SMS format supported on IMS.
		*
		* @return the SMS format from an IMS Service if available. Otherwise, mImsSmsFormat for the
		* older implementation.
		*/
		public String getImsSmsFormat() {
		return mImsSmsFormat;
		return mImsSmsDispatcher.isAvailable() ? mImsSmsDispatcher.getFormat() : mImsSmsFormat;
		}

		/**
		@@ -531,7 +543,7 @@ public class SmsDispatchersController extends Handler {
		return (PhoneConstants.PHONE_TYPE_CDMA == mPhone.getPhoneType());
		}
		// IMS is registered with SMS support
		return isCdmaFormat(mImsSmsFormat);
		return isCdmaFormat(getImsSmsFormat());
		}

		/**