Merge branch 'epic326-u-a14' into 'v1-u' (cd0023bb) · Commits · e / os / android_frameworks_opt_telephony

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

+18 −1

Original line number	Diff line number	Diff line
		@@ -137,6 +137,8 @@ public class SmsDispatchersController extends Handler {
		private final Context mContext;
		private final @NonNull FeatureFlags mFeatureFlags;

		private TelephonyManager mTelephonyManager;

		/** true if IMS is registered and sms is supported, false otherwise.*/
		private boolean mIms = false;
		private String mImsSmsFormat = SmsConstants.FORMAT_UNKNOWN;
		@@ -657,9 +659,24 @@ public class SmsDispatchersController extends Handler {
		}
		}


		private void updateImsInfo(AsyncResult ar) {
		int[] responseArray = (int[]) ar.result;
		int mcc, mnc;

		mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);

		String carrierMccMnc = mTelephonyManager.getNetworkOperator();

		Rlog.d(TAG, "Fetched MCCMNC: " + carrierMccMnc);

		if ("20820".equals(carrierMccMnc) \|\| "26003".equals(carrierMccMnc)) {
		setImsSmsFormat(PhoneConstants.PHONE_TYPE_GSM); // Sets 3GPP format
		Rlog.d(TAG, "Forced GSM format for carrier: " + carrierMccMnc);
		} else {
		setImsSmsFormat(responseArray[1]);
		}

		mIms = responseArray[0] == 1 && !SmsConstants.FORMAT_UNKNOWN.equals(mImsSmsFormat);
		Rlog.d(TAG, "IMS registration state: " + mIms + " format: " + mImsSmsFormat);
		}