Merge "Don't let NAW.mNetworkInfo escape"
This commit is contained in:
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user