LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Change-Id: I5811b1c40540123b0d6446f8af7638ce2eac6d99
This commit is contained in:
Treehugger Robot
2020-10-09 11:51:01 +00:00
committed by Automerger Merge Worker
parent 96c5807a35 a6fa1d584b
commit 04f8105750
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/net/integration/util/com/android/server/NetworkAgentWrapper.java
View File

@@ -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;
}