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

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

Merge "Don't let NAW.mNetworkInfo escape" am: 60b3b9e7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976

Change-Id: I01ef40f341c653a524ee4565c3d9bf2564e0f98f
parents 1015bae3 60b3b9e7

tests/net/integration/util/com/android/server/NetworkAgentWrapper.java

+1 −5
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ public class NetworkAgentWrapper implements TestableNetworkCallback.HasNetwork { 


    public void connect() {

        assertNotEquals("MockNetworkAgents can only be connected once",

                getNetworkInfo().getDetailedState(), NetworkInfo.DetailedState.CONNECTED);

                mNetworkInfo.getDetailedState(), NetworkInfo.DetailedState.CONNECTED);

        mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, null, null);

        mNetworkAgent.sendNetworkInfo(mNetworkInfo);

    }
@@ -268,10 +268,6 @@ public class NetworkAgentWrapper implements TestableNetworkCallback.HasNetwork { 
        return mNetworkAgent;

    }



    public NetworkInfo getNetworkInfo() {

        return mNetworkInfo;

    }



    public NetworkCapabilities getNetworkCapabilities() {

        return mNetworkCapabilities;

    }