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

Commit 3389e95d authored by Naresh Kumar Podishetty (xWF)'s avatar Naresh Kumar Podishetty (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Replace isInCarrierRoamingNbIotNtn() with" 

This reverts commit 7313e64f.

Reason for revert: <Droidmonitor created revert due to b/378613335. Will be verifying through ABTD before submission.>

Change-Id: I484db5366419603988b5fe9e100eee8b353245b7
parent 7313e64f

src/java/com/android/internal/telephony/InboundSmsHandler.java

+4 −3
Original line number Diff line number Diff line
@@ -692,10 +692,11 @@ public abstract class InboundSmsHandler extends StateMachine { 
        if (mFeatureFlags.carrierRoamingNbIotNtn()) {

            if (result == Intents.RESULT_SMS_HANDLED) {

                SatelliteController satelliteController = SatelliteController.getInstance();

                if (satelliteController != null

                        && satelliteController.shouldSendSmsToDatagramDispatcher(mPhone)) {

                    satelliteController.onSmsReceived(mPhone.getSubId());

                if (satelliteController == null) {

                    log("SatelliteController is not initialized");

                    return;

                }

                satelliteController.onSmsReceived(mPhone.getSubId());

            }

        }

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

+1 −3
Original line number Diff line number Diff line
@@ -1257,10 +1257,8 @@ public class DatagramDispatcher extends Handler { 
    }



    private boolean shouldPollMtSms() {

        SatelliteController satelliteController = SatelliteController.getInstance();

        Phone satellitePhone = satelliteController.getSatellitePhone();

        return isEnabledMtSmsPolling()

                && satelliteController.shouldSendSmsToDatagramDispatcher(satellitePhone);

                && SatelliteController.getInstance().isInCarrierRoamingNbIotNtn();

    }



    @GuardedBy("mLock")

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

+1 −1
Original line number Diff line number Diff line
@@ -7762,7 +7762,7 @@ public class SatelliteController extends Handler { 
    }



    /** Returns whether to send SMS to DatagramDispatcher or not. */

    public boolean shouldSendSmsToDatagramDispatcher(@Nullable Phone phone) {

    public boolean shouldSendSmsToDatagramDispatcher(@NonNull Phone phone) {

        if (!isInCarrierRoamingNbIotNtn(phone)) {

            return false;

        }