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

Commit a06f977e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fixed that data not disconnected when mobile data off" am: 7fb2d607 

Change-Id: Ib0d8434021ae8df52670c1b9915aaae0d861b67e
parents 7c07c6b1 7fb2d607

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

+3 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class DcNetworkAgent extends NetworkAgent { 
        mNetworkCapabilities = dc.getNetworkCapabilities();

        mTransportType = transportType;

        mDataConnection = dc;

        mNetworkInfo = ni;

        mNetworkInfo = new NetworkInfo(ni);

        logd(mTag + " created for data connection " + dc.getName());

    }
@@ -258,9 +258,10 @@ public class DcNetworkAgent extends NetworkAgent { 
        }

        if ((oldState == NetworkInfo.State.SUSPENDED || oldState == NetworkInfo.State.CONNECTED)

                && state == NetworkInfo.State.DISCONNECTED) {

            logd("Unregister from connectivity service");

            unregister();

        }

        mNetworkInfo = networkInfo;

        mNetworkInfo = new NetworkInfo(networkInfo);

    }



    /**