commit 21744c94a2f61c7f90e6e07120193bef1476ce0b
author Aishwarya Mallampati <amallampati@google.com> Wed Jan 29 00:56:26 2025 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 29 10:22:22 2025 -0800
tree 3d234e7aa075974e1adc0c08d8533ceefccb522d
parent 7a0216085802a29f7f9a574710f62e125dc201b3

Block SMS in satellite mode if P2P SMS is not supported

Bug: 392981300
Test: 392980302
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6ed9a419f30c64393477d68c9283a04b36d22238)
Merged-In: I7ecdf0d4ea9776be6147d75255da4c58d1c575dc
Change-Id: I7ecdf0d4ea9776be6147d75255da4c58d1c575dc

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);