commit b2265a6af930d21721fd262ab4fb07acf5fcb748
author Hidayat Khan <hidayatkhan@google.com> Sat Nov 23 06:21:13 2024 +0000
committer Hidayat Khan <hidayatkhan@google.com> Wed Nov 27 00:55:20 2024 +0000
tree f19957f3e06f0d95822b047a41e728ea8a0d5cfb
parent 0051b2e7b3e6ae5461e8bf279db942b2637a4d60

Added IsSatelliteSystemNotificationsEnabled check

Bug: 378782898
Test: atest SatelliteControllerTest
FLAG: com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn
Change-Id: Ie76a51b013a6f46fb2f1bada5bf11e5fd6d59a05

src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java

diff --git a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
index fa56cd0..e8f752e 100644
--- a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
+++ b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
@@ -1488,7 +1488,11 @@
         logd("mSatelliteDisallowedReasons:"
                 + String.join(", ", mSatelliteDisallowedReasons.toString()));
         notifySatelliteDisallowedReasonsChanged();
-        if (mFeatureFlags.carrierRoamingNbIotNtn() && mNotifySatelliteAvailabilityEnabled) {
+        int subId = mSatelliteController.getSelectedSatelliteSubId();
+        int carrierRoamingNtnConnectType =
+            mSatelliteController.getCarrierRoamingNtnConnectType(subId);
+        if (mSatelliteController.isSatelliteSystemNotificationsEnabled(
+                carrierRoamingNtnConnectType)) {
             showSatelliteSystemNotification();
         }
     }