From 2b878902828f9239cd90efff8a259b95eb6045ff Mon Sep 17 00:00:00 2001 From: lucaslin Date: Wed, 24 Mar 2021 16:23:35 +0800 Subject: [PATCH] Add static for constant Bug: 182963397 Test: atest IpConnectivityMetricsTest Test: atest NetdEventListenerServiceTest Change-Id: I3826b9efc3418a724bd3753b9ad573adc3343b72 Merged-In: I3826b9efc3418a724bd3753b9ad573adc3343b72 (cherry-picked from ag/13975513) --- .../server/connectivity/IpConnectivityMetricsTest.java | 6 +++--- .../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 97c65eb6d3..8b072c49de 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 52975e4424..50aaaee244 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) {