Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc659ac4 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Add static for constant" into sc-dev am: 612a4a78 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13975513

Change-Id: Ief26f9b10b03a87ca4e8d21a8a5be4b17e32d52d
parents d7b0571c 612a4a78

tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java

+3 −3
Original line number Diff line number Diff line
@@ -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 {

tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java

+3 −3
Original line number Diff line number Diff line
@@ -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) {