commit 25085d31e193884bf39f6276654d810e2f7fa862
author Hidayat Khan <hidayatkhan@google.com> Wed Nov 27 09:11:33 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 27 09:11:33 2024 +0000
tree 8fe253a36b49735fe58ecf6088158121489e7185
parent f20edbf2a8a62b40a7fea8de6b50e752e576e40c
parent b2265a6af930d21721fd262ab4fb07acf5fcb748

Merge "Added IsSatelliteSystemNotificationsEnabled check" into main

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