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

Commit b7814369 authored by Jack Yu's avatar Jack Yu
Browse files

Fixed MMS data connection not re-established after airplane mode 

In some corner cases, data attached event is not sent from service
state tracker after APM on with IWLAN available. Fixed by sending
data attached event for the first time airplane mode is on and
data is in service.

Test: Manual
Bug: 130785238
Change-Id: I25b69542f70cdab9a415606abcebd9c96578972f
parent b6069239

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

+18 −4
Original line number Diff line number Diff line
@@ -3033,6 +3033,10 @@ public class ServiceStateTracker extends Handler { 
                mSS.getVoiceRegState() == ServiceState.STATE_IN_SERVICE

                        && mNewSS.getVoiceRegState() != ServiceState.STATE_IN_SERVICE;



        boolean hasAirplaneModeOnChanged =

                mSS.getVoiceRegState() != ServiceState.STATE_POWER_OFF

                        && mNewSS.getVoiceRegState() == ServiceState.STATE_POWER_OFF;



        SparseBooleanArray hasDataAttached = new SparseBooleanArray(

                mTransportManager.getAvailableTransports().length);

        SparseBooleanArray hasDataDetached = new SparseBooleanArray(
@@ -3049,7 +3053,12 @@ public class ServiceStateTracker extends Handler { 
            NetworkRegistrationInfo newNrs = mNewSS.getNetworkRegistrationInfo(

                    NetworkRegistrationInfo.DOMAIN_PS, transport);



            boolean changed = (oldNrs == null || !oldNrs.isInService())

            // If the previously it was not in service, and now it's in service, trigger the

            // attached event. Also if airplane mode was just turned on, and data is already in

            // service, we need to trigger the attached event again so that DcTracker can setup

            // data on all connectable APNs again (because we've already torn down all data

            // connections just before airplane mode turned on)

            boolean changed = (oldNrs == null || !oldNrs.isInService() || hasAirplaneModeOnChanged)

                    && (newNrs != null && newNrs.isInService());

            hasDataAttached.put(transport, changed);
@@ -3166,7 +3175,8 @@ public class ServiceStateTracker extends Handler { 
                    + " hasLostMultiApnSupport = " + hasLostMultiApnSupport

                    + " hasCssIndicatorChanged = " + hasCssIndicatorChanged

                    + " hasNrFrequencyRangeChanged = " + hasNrFrequencyRangeChanged

                    + " hasNrStateChanged = " + hasNrStateChanged);

                    + " hasNrStateChanged = " + hasNrStateChanged

                    + " hasAirplaneModeOnlChanged = " + hasAirplaneModeOnChanged);

        }



        // Add an event log when connection state changes
@@ -3336,13 +3346,17 @@ public class ServiceStateTracker extends Handler { 


            if (hasDataAttached.get(transport)) {

                shouldLogAttachedChange = true;

                if (mAttachedRegistrants.get(transport) != null) {

                    mAttachedRegistrants.get(transport).notifyRegistrants();

                }

            }

            if (hasDataDetached.get(transport)) {

                shouldLogAttachedChange = true;

                if (mDetachedRegistrants.get(transport) != null) {

                    mDetachedRegistrants.get(transport).notifyRegistrants();

                }

            }

        }



        if (shouldLogAttachedChange) {

            logAttachChange();