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

Commit 2bdebcdb authored by SongFerngWang's avatar SongFerngWang
Browse files

Reset TelephonyDisplayInfo and timer when data connection state changed 

Move TelephonyDisplayInfo changed from MobileSignalController to
NetworkTypeController when data connection state changed.

Bug: 157710254
Test: atest NetworkTypeControllerTest
Change-Id: Ia2d3edba721752e5ebea89493b2015e5b391fa3b
Merged-In: Ia2d3edba721752e5ebea89493b2015e5b391fa3b
parent 63054caf

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

+18 −3
Original line number Diff line number Diff line
@@ -85,12 +85,14 @@ public class NetworkTypeController extends StateMachine { 
    private static final int EVENT_PRIMARY_TIMER_EXPIRED = 8;

    private static final int EVENT_SECONDARY_TIMER_EXPIRED = 9;

    private static final int EVENT_RADIO_OFF_OR_UNAVAILABLE = 10;

    private static final int EVENT_DATA_CONNECTION_STATE_CHANGED = 11;

    private static final int[] ALL_EVENTS = { EVENT_DATA_RAT_CHANGED, EVENT_NR_STATE_CHANGED,

            EVENT_NR_FREQUENCY_CHANGED, EVENT_DATA_ACTIVITY_CHANGED,

            EVENT_PHYSICAL_CHANNEL_CONFIG_NOTIF_CHANGED, EVENT_CARRIER_CONFIG_CHANGED,

            EVENT_PRIMARY_TIMER_EXPIRED, EVENT_SECONDARY_TIMER_EXPIRED };

            EVENT_PRIMARY_TIMER_EXPIRED, EVENT_SECONDARY_TIMER_EXPIRED,

            EVENT_DATA_CONNECTION_STATE_CHANGED};



    private static final String[] sEvents = new String[EVENT_RADIO_OFF_OR_UNAVAILABLE + 1];

    private static final String[] sEvents = new String[EVENT_DATA_CONNECTION_STATE_CHANGED + 1];

    static {

        sEvents[EVENT_UPDATE] = "EVENT_UPDATE";

        sEvents[EVENT_QUIT] = "EVENT_QUIT";
@@ -104,6 +106,7 @@ public class NetworkTypeController extends StateMachine { 
        sEvents[EVENT_PRIMARY_TIMER_EXPIRED] = "EVENT_PRIMARY_TIMER_EXPIRED";

        sEvents[EVENT_SECONDARY_TIMER_EXPIRED] = "EVENT_SECONDARY_TIMER_EXPIRED";

        sEvents[EVENT_RADIO_OFF_OR_UNAVAILABLE] = "EVENT_RADIO_OFF_OR_UNAVAILABLE";

        sEvents[EVENT_DATA_CONNECTION_STATE_CHANGED] = "EVENT_DATA_CONNECTION_STATE_CHANGED";

    }



    private final Phone mPhone;
@@ -126,6 +129,10 @@ public class NetworkTypeController extends StateMachine { 
        public void onDataActivity(int direction) {

            sendMessage(EVENT_DATA_ACTIVITY_CHANGED);

        }

        @Override

        public void onDataConnectionStateChanged(int state, int networkType) {

            sendMessage(EVENT_DATA_CONNECTION_STATE_CHANGED);

        }

    };



    private Map<String, OverrideTimerRule> mOverrideTimerRules = new HashMap<>();
@@ -187,7 +194,8 @@ public class NetworkTypeController extends StateMachine { 
        filter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        mPhone.getContext().registerReceiver(mIntentReceiver, filter, null, mPhone);

        if (mTelephonyManager != null) {

            mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_DATA_ACTIVITY);

            mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_DATA_ACTIVITY

                    | PhoneStateListener.LISTEN_DATA_CONNECTION_STATE);

        }

    }
@@ -477,6 +485,13 @@ public class NetworkTypeController extends StateMachine { 
                    resetAllTimers();

                    transitionTo(mLegacyState);

                    break;

                case EVENT_DATA_CONNECTION_STATE_CHANGED:

                    if (mPhone.getServiceState().getDataNetworkType()

                            != mDisplayInfoController.getTelephonyDisplayInfo().getNetworkType()) {

                        resetAllTimers();

                        transitionToCurrentState();

                    }

                    break;

                default:

                    throw new RuntimeException("Received invalid event: " + msg.what);

            }