From a6b77f5fc2843f74adfa3bf0187eaf5201f5421d Mon Sep 17 00:00:00 2001 From: Daniel Jacob Chittoor Date: Sun, 18 Feb 2024 18:39:02 +0530 Subject: [PATCH 1/3] SmsDispatchersController: Force 3GPP dispatch for Bouygues SA Co-authored-by: Rohit Sekhar Change-Id: I7511dc6ad74aaa1056aea2ab607173659867c1f0 --- .../telephony/SmsDispatchersController.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/java/com/android/internal/telephony/SmsDispatchersController.java b/src/java/com/android/internal/telephony/SmsDispatchersController.java index cc287f8055..f04e3abec2 100644 --- a/src/java/com/android/internal/telephony/SmsDispatchersController.java +++ b/src/java/com/android/internal/telephony/SmsDispatchersController.java @@ -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,21 @@ public class SmsDispatchersController extends Handler { } } + private void updateImsInfo(AsyncResult ar) { int[] responseArray = (int[]) ar.result; - setImsSmsFormat(responseArray[1]); + int mcc, mnc; + + mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE); + + String carrierMccMnc = mTelephonyManager.getNetworkOperator(); + + if ("20820".equals(carrierMccMnc)) { // Check if MCC is 208 and MNC is 20 (Bouygues) + setImsSmsFormat(PhoneConstants.PHONE_TYPE_GSM); // Sets 3GPP format + } else { + setImsSmsFormat(responseArray[1]); + } + mIms = responseArray[0] == 1 && !SmsConstants.FORMAT_UNKNOWN.equals(mImsSmsFormat); Rlog.d(TAG, "IMS registration state: " + mIms + " format: " + mImsSmsFormat); } -- GitLab From 4f4b11f66813a981df27fe438847a02b98d05b88 Mon Sep 17 00:00:00 2001 From: Daniel Jacob Chittoor Date: Mon, 10 Jun 2024 09:34:28 +0000 Subject: [PATCH 2/3] SmsDispatchersController: Extend 3GPP dispatch for Orange PL --- .../android/internal/telephony/SmsDispatchersController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/android/internal/telephony/SmsDispatchersController.java b/src/java/com/android/internal/telephony/SmsDispatchersController.java index f04e3abec2..53204bbacf 100644 --- a/src/java/com/android/internal/telephony/SmsDispatchersController.java +++ b/src/java/com/android/internal/telephony/SmsDispatchersController.java @@ -668,7 +668,7 @@ public class SmsDispatchersController extends Handler { String carrierMccMnc = mTelephonyManager.getNetworkOperator(); - if ("20820".equals(carrierMccMnc)) { // Check if MCC is 208 and MNC is 20 (Bouygues) + if ("20820".equals(carrierMccMnc) || "26003".equals(carrierMccMnc)) { setImsSmsFormat(PhoneConstants.PHONE_TYPE_GSM); // Sets 3GPP format } else { setImsSmsFormat(responseArray[1]); -- GitLab From 0207679a0336969464e47532993450afaf7017c6 Mon Sep 17 00:00:00 2001 From: Daniel Jacob Chittoor Date: Mon, 10 Jun 2024 15:07:57 +0530 Subject: [PATCH 3/3] SmsDispatchersController: Add debug statements in case of bugreports --- .../android/internal/telephony/SmsDispatchersController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/java/com/android/internal/telephony/SmsDispatchersController.java b/src/java/com/android/internal/telephony/SmsDispatchersController.java index 53204bbacf..10844894bb 100644 --- a/src/java/com/android/internal/telephony/SmsDispatchersController.java +++ b/src/java/com/android/internal/telephony/SmsDispatchersController.java @@ -668,8 +668,11 @@ public class SmsDispatchersController extends Handler { 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]); } -- GitLab