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

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

Merge "Change Old and New LinkProperties parameter position" am: 356e5732... 

Merge "Change Old and New LinkProperties parameter position" am: 356e5732 am: 1e9b3a54 am: 316b3862

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



Change-Id: I6603a8d7c538f26dd0387877f9352fdd456be445
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2798ec24 316b3862

src/java/com/android/internal/telephony/data/DataNetwork.java

+1 −1
Original line number Diff line number Diff line
@@ -2346,7 +2346,7 @@ public class DataNetwork extends StateMachine { 
            // If the new link properties is not compatible (e.g. IP changes, interface changes),

            // then we should de-register the network agent and re-create a new one.

            if ((isConnected() || isHandoverInProgress())

                    && !isLinkPropertiesCompatible(linkProperties, mLinkProperties)) {

                    && !isLinkPropertiesCompatible(mLinkProperties, linkProperties)) {

                logl("updateDataNetwork: Incompatible link properties detected. Re-create the "

                        + "network agent. Changed from " + mLinkProperties + " to "

                        + linkProperties);