Return false if radio is off in isCarrierRoamingNtnEligible
Bug: 376273308
Test: atest SatelliteControllerTest
Test: Manually tested SMS/MMS/CALLS/DATA
FLAG: EXEMPT bugfix
Change-Id: I140b474c08f9735b73aae398ab296635a5bbf058
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteController.java b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
index a86089a..02c410d 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteController.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
@@ -4294,7 +4294,7 @@
RequestSatelliteEnabledArgument argument =
(RequestSatelliteEnabledArgument) request.argument;
handlePersistentLoggingOnSessionStart(argument);
- selectBindingSatelliteSubscription(true);
+ selectBindingSatelliteSubscription(argument.enableSatellite);
SatelliteModemEnableRequestAttributes enableRequestAttributes =
createModemEnableRequest(argument);
if (enableRequestAttributes == null) {
@@ -7140,6 +7140,11 @@
return false;
}
+ if (!mIsRadioOn) {
+ plogd("isCarrierRoamingNtnEligible: radio is off");
+ return false;
+ }
+
if (phone == null) {
plogd("isCarrierRoamingNtnEligible: phone is null");
return false;