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

Merge changes I3826b9ef,I91d68ca3 am: 364ad64fa7

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

Change-Id: Iec425473511a1fe1f4b2bcf633e56ae1c76102c0
This commit is contained in:
Treehugger Robot
2021-03-30 08:35:20 +00:00
committed by Automerger Merge Worker
parent 4b3b6d68eb 364ad64fa7
commit 41d68e4f4a
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; IpConnectivityMetrics mService;
NetdEventListenerService mNetdListener; NetdEventListenerService mNetdListener;
final NetworkCapabilities mNcWifi = new NetworkCapabilities.Builder() private static final NetworkCapabilities CAPABILITIES_WIFI = new NetworkCapabilities.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI) .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
.build(); .build();
final NetworkCapabilities mNcCell = new NetworkCapabilities.Builder() private static final NetworkCapabilities CAPABILITIES_CELL = new NetworkCapabilities.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR) .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
.build(); .build();
@@ -590,7 +590,7 @@ public class IpConnectivityMetricsTest {
ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class); ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class);
verify(mCm).registerNetworkCallback(any(), networkCallback.capture()); verify(mCm).registerNetworkCallback(any(), networkCallback.capture());
networkCallback.getValue().onCapabilitiesChanged(new Network(netId), 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 { 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; NetdEventListenerService mService;
ConnectivityManager mCm; ConnectivityManager mCm;
final NetworkCapabilities mNcWifi = new NetworkCapabilities.Builder() private static final NetworkCapabilities CAPABILITIES_WIFI = new NetworkCapabilities.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI) .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
.build(); .build();
final NetworkCapabilities mNcCell = new NetworkCapabilities.Builder() private static final NetworkCapabilities CAPABILITIES_CELL = new NetworkCapabilities.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR) .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
.build(); .build();
@@ -475,7 +475,7 @@ public class NetdEventListenerServiceTest {
ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class); ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class);
verify(mCm).registerNetworkCallback(any(), networkCallback.capture()); verify(mCm).registerNetworkCallback(any(), networkCallback.capture());
networkCallback.getValue().onCapabilitiesChanged(new Network(netId), 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) { Thread connectEventAction(int netId, int error, int latencyMs, String ipAddr) {