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

Commit 60b3b9e7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Don't let NAW.mNetworkInfo escape"

parents 8f7a9357 6d5e944b

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

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




    public void connect() {

    public void connect() {

        assertNotEquals("MockNetworkAgents can only be connected once",

        assertNotEquals("MockNetworkAgents can only be connected once",

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

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

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

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

        mNetworkAgent.sendNetworkInfo(mNetworkInfo);

        mNetworkAgent.sendNetworkInfo(mNetworkInfo);

    }

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

        return mNetworkAgent;

    }

    }





    public NetworkInfo getNetworkInfo() {

        return mNetworkInfo;

    }



    public NetworkCapabilities getNetworkCapabilities() {

    public NetworkCapabilities getNetworkCapabilities() {

        return mNetworkCapabilities;

        return mNetworkCapabilities;

    }

    }