commit c813e78cfb2bd703f96d9f83f0c9a94fa7d0a630
author Aishwarya Mallampati <amallampati@google.com> Fri Nov 08 23:27:04 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 08 23:27:04 2024 +0000
tree 9a72883bd3235bbaade73fa5d57f6dda32fb6c35
parent 9635551422fbe3aa0c7965671e834d18de8b4540
parent 8ecdb4af0e5293fd2ce877447f6d0fa21f0746b0

Merge "Return false if radio is off in isCarrierRoamingNtnEligible" into main

src/java/com/android/internal/telephony/satellite/SatelliteController.java

diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteController.java b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
index 7edfa0f..21d3f7a 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteController.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
@@ -4292,7 +4292,7 @@
         RequestSatelliteEnabledArgument argument =
                 (RequestSatelliteEnabledArgument) request.argument;
         handlePersistentLoggingOnSessionStart(argument);
-        selectBindingSatelliteSubscription(true);
+        selectBindingSatelliteSubscription(argument.enableSatellite);
         SatelliteModemEnableRequestAttributes enableRequestAttributes =
                     createModemEnableRequest(argument);
         if (enableRequestAttributes == null) {
@@ -7147,6 +7147,11 @@
             return false;
         }
 
+        if (!mIsRadioOn) {
+            plogd("isCarrierRoamingNtnEligible: radio is off");
+            return false;
+        }
+
         if (phone == null) {
             plogd("isCarrierRoamingNtnEligible: phone is null");
             return false;