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

Commit e4e63a60 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Block SMS in satellite mode if P2P SMS is not supported" into main

parents c33fa76d 6ed9a419

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

+10 −0
Original line number Diff line number Diff line
@@ -1879,6 +1879,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);
@@ -2043,6 +2048,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);