Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 635173d8 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-15.0.0_r21' into staging/lineage-22.2_merge-android-15.0.0_r21 

Android 15.0.0 Release 21 (BP1A.250305.020)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8fKDwAKCRDorT+BmrEO
# eNuoAJ9i7Kb2XjRX62ja8wzT0fJr5TXiFACgh492cpH0LnzGofgO5ePFnqxS5EQ=
# =SdCo
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Mar  5 05:50:39 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

* tag 'android-15.0.0_r21':
  Update carrier roaming available services after selecting satellite subscription.

Change-Id: I17ee4686c3ad59781196061f9759d23fca8c1d01
parents 2779fbc1 1340da9f

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

+21 −1
Original line number Diff line number Diff line
@@ -7398,6 +7398,7 @@ public class SatelliteController extends Handler { 


    public int getSelectedSatelliteSubId() {

        synchronized (mSatelliteTokenProvisionedLock) {

            plogd("getSelectedSatelliteSubId: subId=" + mSelectedSatelliteSubId);

            return mSelectedSatelliteSubId;

        }

    }
@@ -7477,6 +7478,7 @@ public class SatelliteController extends Handler { 
        }

        plogd("selectBindingSatelliteSubscription: SelectedSatelliteSubId=" + selectedSubId);

        handleEventSelectedNbIotSatelliteSubscriptionChanged(selectedSubId);

        handleCarrierRoamingNtnAvailableServicesChanged();

    }



    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
@@ -7699,7 +7701,7 @@ public class SatelliteController extends Handler { 
            return;

        }

        persistNtnSmsSupportedByMessagesApp(ntnSmsSupported);

        handleCarrierRoamingNtnAvailableServicesChanged(getSelectedSatelliteSubId());

        handleCarrierRoamingNtnAvailableServicesChanged();

    }



    private void persistNtnSmsSupportedByMessagesApp(boolean ntnSmsSupported) {
@@ -7753,6 +7755,7 @@ public class SatelliteController extends Handler { 
    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)

    protected void setSelectedSatelliteSubId(int subId) {

        synchronized (mSatelliteTokenProvisionedLock) {

            plogd("setSelectedSatelliteSubId: subId=" + subId);

            mSelectedSatelliteSubId = subId;

        }

    }
@@ -7925,7 +7928,9 @@ public class SatelliteController extends Handler { 
                    synchronized (mSatelliteAccessConfigLock) {

                        mSatelliteAccessAllowed = isAllowed;

                    }

                    evaluateESOSProfilesPrioritization();

                    evaluateCarrierRoamingNtnEligibilityChange();

                    handleCarrierRoamingNtnAvailableServicesChanged();

                }



                @Override
@@ -8233,8 +8238,23 @@ public class SatelliteController extends Handler { 
                        .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");