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

Commit dd05fa34 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[iwlan] clean up data connections on service restart" am: d88dcc54 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1350583

Change-Id: Iecc34c18d77c97e85fd48c56a7c26aeb562e9153
parents 8b8bcaf2 d88dcc54

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

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ public interface PhoneInternalInterface { 
    static final String REASON_CSS_INDICATOR_CHANGED = "cssIndicatorChanged";

    static final String REASON_RELEASED_BY_CONNECTIVITY_SERVICE = "releasedByConnectivityService";

    static final String REASON_DATA_ENABLED_OVERRIDE = "dataEnabledOverride";

    static final String REASON_IWLAN_DATA_SERVICE_DIED = "iwlanDataServiceDied";



    // Used for band mode selection methods

    static final int BM_UNSPECIFIED = RILConstants.BAND_MODE_UNSPECIFIED; // automatic

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+8 −0
Original line number Diff line number Diff line
@@ -5039,6 +5039,14 @@ public class DcTracker extends Handler { 
            }

            mDcc.start();

        } else {

            if (mTransportType == AccessNetworkConstants.TRANSPORT_TYPE_WLAN) {

                boolean connPersistenceOnRestart = mPhone.getContext().getResources()

                   .getBoolean(com.android

                       .internal.R.bool.config_wlan_data_service_conn_persistence_on_restart);

                if (!connPersistenceOnRestart) {

                    cleanUpAllConnectionsInternal(false, Phone.REASON_IWLAN_DATA_SERVICE_DIED);

                }

            }

            mDcc.dispose();

            // dispose sets the associated Handler object (StateMachine#mSmHandler) to null, so mDcc

            // needs to be created again (simply calling start() on it after dispose will not work)