From 84fa4200384cfbdbe0f184d289c9b6687634f009 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Wed, 15 May 2019 15:53:39 +0000 Subject: [PATCH 1/2] telephony: Setup CI to update from upstream && automerge Change-Id: I7f9e3263d900b1af0f323136b298bdb09f218407 --- .gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000..5150363110 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,11 @@ +stages: + - auto-merge-main + - update-from-upstream + +include: + - project: 'e/templates' + ref: master + file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml' + - project: 'e/templates' + ref: master + file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml' -- GitLab From 03d5c8d8d4bf402803bada7e8b11f86e8c5adcb5 Mon Sep 17 00:00:00 2001 From: Daniel Jacob Chittoor Date: Sun, 18 Feb 2024 18:39:02 +0530 Subject: [PATCH 2/2] SmsDispatchersController: Force 3GPP dispatch for Bouygues SA Co-authored-by: Rohit Sekhar Change-Id: I7511dc6ad74aaa1056aea2ab607173659867c1f0 --- .../telephony/SmsDispatchersController.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/java/com/android/internal/telephony/SmsDispatchersController.java b/src/java/com/android/internal/telephony/SmsDispatchersController.java index 53556ac9f7..a6a4edd6fa 100644 --- a/src/java/com/android/internal/telephony/SmsDispatchersController.java +++ b/src/java/com/android/internal/telephony/SmsDispatchersController.java @@ -37,6 +37,7 @@ import android.provider.Telephony.Sms.Intents; import android.telephony.ServiceState; import android.telephony.SmsManager; import android.telephony.SmsMessage; +import android.telephony.TelephonyManager; import com.android.ims.ImsManager; import com.android.internal.annotations.VisibleForTesting; @@ -103,6 +104,8 @@ public class SmsDispatchersController extends Handler { private final CommandsInterface mCi; private final Context mContext; + private TelephonyManager mTelephonyManager; + /** true if IMS is registered and sms is supported, false otherwise.*/ private boolean mIms = false; private String mImsSmsFormat = SmsConstants.FORMAT_UNKNOWN; @@ -367,9 +370,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