Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33e52116 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31498196'] into 25Q1-release. 

Change-Id: Ie20cbbf02bf6058a00ae4932af230553b998e96a
parents 7a021608 21744c94

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

+10 −0
Original line number Diff line number Diff line
@@ -1878,6 +1878,11 @@ public class SmsDispatchersController extends Handler { 
            // Send P2P SMS using carrier roaming NB IOT NTN

            DatagramDispatcher.getInstance().sendSms(pendingRequest);

            return;

        } else if (SatelliteController.getInstance().isInCarrierRoamingNbIotNtn()) {

            Rlog.d(TAG, "Block SMS in carrier roaming NB IOT NTN mode.");

            // Block SMS in satellite mode if P2P SMS is not supported.

            triggerSentIntentForFailure(pendingRequest.sentIntents);

            return;

        }



        sendTextInternal(pendingRequest);
@@ -2042,6 +2047,11 @@ public class SmsDispatchersController extends Handler { 
            // Send multipart P2P SMS using carrier roaming NB IOT NTN

            DatagramDispatcher.getInstance().sendSms(pendingRequest);

            return;

        } else if (SatelliteController.getInstance().isInCarrierRoamingNbIotNtn()) {

            Rlog.d(TAG, "Block SMS in carrier roaming NB IOT NTN mode.");

            // Block SMS in satellite mode if P2P SMS is not supported.

            triggerSentIntentForFailure(pendingRequest.sentIntents);

            return;

        }



        sendMultipartTextInternal(pendingRequest);