diff options
| author | 2021-03-30 09:02:35 +0000 | |
|---|---|---|
| committer | 2021-03-30 09:02:35 +0000 | |
| commit | 85732c9801d5c9e76d6be62117d1bda51b4394cd (patch) | |
| tree | e9999768766aa0c49c62811081c901208071ed33 | |
| parent | 335b11513624a0944532c6b2a3cc75087b05d39f (diff) | |
| parent | 97517b84c2160e484fa827537f7834e091373a19 (diff) | |
Merge changes I3826b9ef,I91d68ca3 am: 06c6ff8bf0 am: 97517b84c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654008
Change-Id: Ia10fe44c45f5dbaea808025210b7a287209b85dc
| -rw-r--r-- | tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java | 6 | ||||
| -rw-r--r-- | tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java index 97c65eb6d31b..8b072c49de82 100644 --- a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java +++ b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java @@ -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 { diff --git a/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java b/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java index 52975e4424bc..50aaaee24418 100644 --- a/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java +++ b/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java @@ -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) { |