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

Commit a12e4302 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[satellite] Removed disallowedReason condition" into main

parents ad3f09bf c57a8121

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

+1 −9
Original line number Diff line number Diff line
@@ -7591,15 +7591,7 @@ public class SatelliteController extends Handler { 


    /** Return services that are supported on carrier roaming non-terrestrial network. */

    public int[] getSupportedServicesOnCarrierRoamingNtn(int subId) {

        SatelliteManager satelliteManager = mContext.getSystemService(SatelliteManager.class);

        if (satelliteManager == null) {

            plogd("updateLastNotifiedNtnAvailableServicesAndNotify: satelliteManager is null");

            return new int[0];

        }



        List<Integer> satelliteDisallowedReasons = satelliteManager.getSatelliteDisallowedReasons();

        if (isSatelliteSupportedViaCarrier(subId)

                && (satelliteDisallowedReasons != null && !satelliteDisallowedReasons.isEmpty())) {

        if (isSatelliteSupportedViaCarrier(subId)) {

            // TODO: b/377367448 Cleanup get supported satellite services to align with starlink.

            int[] services = getSupportedSatelliteServicesForCarrier(subId);

            if (isP2PSmsDisallowedOnCarrierRoamingNtn(subId)) {