commit 497eab9a1834a50c92f6ce0acf230e0348777a4e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 09 10:48:42 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 09 10:48:42 2020 +0000
tree a9cf86a281ebff4b13f6c6240313b121cc5209fb
parent 5d476320026cd6db2b96b913447f888db3e54d62
parent 6e8c64b349c0312aff3967f039f89dd180911401

Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349

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

Change-Id: I01ef40f341c653a524ee4565c3d9bf2564e0f98f

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

diff --git a/tests/net/integration/util/com/android/server/NetworkAgentWrapper.java b/tests/net/integration/util/com/android/server/NetworkAgentWrapper.java
index c895420..85704d0 100644
--- a/tests/net/integration/util/com/android/server/NetworkAgentWrapper.java
+++ b/tests/net/integration/util/com/android/server/NetworkAgentWrapper.java
@@ -213,7 +213,7 @@
 
     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 @@
         return mNetworkAgent;
     }
 
-    public NetworkInfo getNetworkInfo() {
-        return mNetworkInfo;
-    }
-
     public NetworkCapabilities getNetworkCapabilities() {
         return mNetworkCapabilities;
     }