commit 33e521167bb042a8ee04d6ef29f852952645c180
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 29 10:24:05 2025 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 29 10:24:05 2025 -0800
tree 3d234e7aa075974e1adc0c08d8533ceefccb522d
parent 7a0216085802a29f7f9a574710f62e125dc201b3
parent 21744c94a2f61c7f90e6e07120193bef1476ce0b

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

Change-Id: Ie20cbbf02bf6058a00ae4932af230553b998e96a

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

diff --git a/src/java/com/android/internal/telephony/SmsDispatchersController.java b/src/java/com/android/internal/telephony/SmsDispatchersController.java
index 373ee4a..de5cc53 100644
--- a/src/java/com/android/internal/telephony/SmsDispatchersController.java
+++ b/src/java/com/android/internal/telephony/SmsDispatchersController.java
@@ -1878,6 +1878,11 @@
             // 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 @@
             // 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);