Merge cherrypicks of ['googleplex-android-review.googlesource.com/31574665'] into 25Q1-release. Change-Id: I4b80e5c507431fc55d0d29c1b7428444340bdedb
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteController.java b/src/java/com/android/internal/telephony/satellite/SatelliteController.java index bf0d882..d455863 100644 --- a/src/java/com/android/internal/telephony/satellite/SatelliteController.java +++ b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
@@ -7398,6 +7398,7 @@ public int getSelectedSatelliteSubId() { synchronized (mSatelliteTokenProvisionedLock) { + plogd("getSelectedSatelliteSubId: subId=" + mSelectedSatelliteSubId); return mSelectedSatelliteSubId; } } @@ -7477,6 +7478,7 @@ } plogd("selectBindingSatelliteSubscription: SelectedSatelliteSubId=" + selectedSubId); handleEventSelectedNbIotSatelliteSubscriptionChanged(selectedSubId); + handleCarrierRoamingNtnAvailableServicesChanged(); } @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) @@ -7699,7 +7701,7 @@ return; } persistNtnSmsSupportedByMessagesApp(ntnSmsSupported); - handleCarrierRoamingNtnAvailableServicesChanged(getSelectedSatelliteSubId()); + handleCarrierRoamingNtnAvailableServicesChanged(); } private void persistNtnSmsSupportedByMessagesApp(boolean ntnSmsSupported) { @@ -7753,6 +7755,7 @@ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) protected void setSelectedSatelliteSubId(int subId) { synchronized (mSatelliteTokenProvisionedLock) { + plogd("setSelectedSatelliteSubId: subId=" + subId); mSelectedSatelliteSubId = subId; } } @@ -7925,7 +7928,9 @@ synchronized (mSatelliteAccessConfigLock) { mSatelliteAccessAllowed = isAllowed; } + evaluateESOSProfilesPrioritization(); evaluateCarrierRoamingNtnEligibilityChange(); + handleCarrierRoamingNtnAvailableServicesChanged(); } @Override @@ -8233,8 +8238,23 @@ .build(); } + private void handleCarrierRoamingNtnAvailableServicesChanged() { + int[] activeSubIds = mSubscriptionManagerService.getActiveSubIdList(true); + if (activeSubIds == null) { + plogd("handleCarrierRoamingNtnAvailableServicesChanged: activeSubIds is null."); + return; + } + + plogd("handleCarrierRoamingNtnAvailableServicesChanged: activeSubIds size=" + + activeSubIds.length); + for (int subId: activeSubIds) { + handleCarrierRoamingNtnAvailableServicesChanged(subId); + } + } + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) protected void handleCarrierRoamingNtnAvailableServicesChanged(int subId) { + plogd("handleCarrierRoamingNtnAvailableServicesChanged: subId=" + subId); if (!mFeatureFlags.carrierRoamingNbIotNtn()) { plogd("handleCarrierRoamingNtnAvailableServicesChanged: " + "carrierRoamingNbIotNtn flag is disabled");