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

Commit 7c05ea1a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13288885 from 747fc50c to 25Q3-release 

Change-Id: Ia632ec32f9d1c9cb1f6e160a13de5b598c9bc6c2
parents 71df0c35 747fc50c

flags/ims.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -177,3 +177,14 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=grantmenke TARGET=25Q4

flag {

    name: "reuse_original_conn_remote_conf_behavior"

    namespace: "telephony"

    description: "Used to reuse the original Telephony Connection when a remotely hosted IMS conference is created."

    bug:"391889544"

    metadata {

        purpose: PURPOSE_FEATURE

    }

}

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

+17 −6
Original line number Diff line number Diff line
@@ -1382,8 +1382,6 @@ public class DatagramDispatcher extends Handler { 
    }



    private boolean allowMtSmsPolling() {

        if (!mFeatureFlags.carrierRoamingNbIotNtn()) return false;



        SatelliteController satelliteController = SatelliteController.getInstance();

        int subId = satelliteController.getSelectedSatelliteSubId();

        boolean isP2PSmsDisallowed =
@@ -1394,20 +1392,33 @@ public class DatagramDispatcher extends Handler { 
        }



        boolean isModemStateConnectedOrTransferring;

        boolean isAligned;

        boolean isMtSmsPollingThrottled;

        synchronized (mLock) {

            if (!mIsAligned) return false;



            isMtSmsPollingThrottled = mIsMtSmsPollingThrottled;

            isAligned = mIsAligned;

            isModemStateConnectedOrTransferring =

                    mModemState == SATELLITE_MODEM_STATE_CONNECTED

                            || mModemState == SATELLITE_MODEM_STATE_DATAGRAM_TRANSFERRING;

        }



        if (isMtSmsPollingThrottled) {

            plogd("allowMtSmsPolling: polling is throttled");

            return false;

        }



        if (!isAligned) {

            plogd("allowMtSmsPolling: not aligned");

            return false;

        }



        if (!isModemStateConnectedOrTransferring && !allowCheckMessageInNotConnected()) {

            plogd("EVENT_MT_SMS_POLLING_THROTTLE_TIMED_OUT:"

            plogd("allowMtSmsPolling: not in service and "

                    + "allow_check_message_in_not_connected is disabled");

            return false;

        }



        plogd("allowMtSmsPolling: return true");

        return true;

    }

src/java/com/android/internal/telephony/uicc/UiccController.java

+48 −63

File changed.

Preview size limit exceeded, changes collapsed.

tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramDispatcherTest.java

+14 −24

File changed.

Preview size limit exceeded, changes collapsed.