Merge "Don't let NAW.mNetworkInfo escape" am: 4fb14d85ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976 Change-Id: I01ef40f341c653a524ee4565c3d9bf2564e0f98f
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user