joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge changes I3826b9ef,I91d68ca3 am: 364ad64fa7 am: 41d68e4f4a

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

Change-Id: Ia10fe44c45f5dbaea808025210b7a287209b85dc
This commit is contained in:
Treehugger Robot 2021-03-30 09:02:35 +00:00 • committed by Automerger Merge Worker
commit 3b8caaa25f
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java
View file

@ -83,10 +83,10 @@ public class IpConnectivityMetricsTest {
IpConnectivityMetrics mService;
NetdEventListenerService mNetdListener;
final NetworkCapabilities mNcWifi = new NetworkCapabilities.Builder()
private static final NetworkCapabilities CAPABILITIES_WIFI = new NetworkCapabilities.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
.build();
final NetworkCapabilities mNcCell = new NetworkCapabilities.Builder()
private static final NetworkCapabilities CAPABILITIES_CELL = new NetworkCapabilities.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
.build();
@ -590,7 +590,7 @@ public class IpConnectivityMetricsTest {
ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class);
verify(mCm).registerNetworkCallback(any(), networkCallback.capture());
networkCallback.getValue().onCapabilitiesChanged(new Network(netId),
netId == 100 ? mNcWifi : mNcCell);
netId == 100 ? CAPABILITIES_WIFI : CAPABILITIES_CELL);
}
void connectEvent(int netId, int error, int latencyMs, String ipAddr) throws Exception {

6
tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java
View file

@ -63,10 +63,10 @@ public class NetdEventListenerServiceTest {
NetdEventListenerService mService;
ConnectivityManager mCm;
final NetworkCapabilities mNcWifi = new NetworkCapabilities.Builder()
private static final NetworkCapabilities CAPABILITIES_WIFI = new NetworkCapabilities.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
.build();
final NetworkCapabilities mNcCell = new NetworkCapabilities.Builder()
private static final NetworkCapabilities CAPABILITIES_CELL = new NetworkCapabilities.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
.build();
@ -475,7 +475,7 @@ public class NetdEventListenerServiceTest {
ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class);
verify(mCm).registerNetworkCallback(any(), networkCallback.capture());
networkCallback.getValue().onCapabilitiesChanged(new Network(netId),
netId == 100 ? mNcWifi : mNcCell);
netId == 100 ? CAPABILITIES_WIFI : CAPABILITIES_CELL);
}
Thread connectEventAction(int netId, int error, int latencyMs, String ipAddr) {