From 842a914dff22313bfa0c7fe02aad57b20873ac16 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Tue, 31 Oct 2023 21:11:37 +0900 Subject: [PATCH] Rename KEEP_CONNECTED_DOWNSTREAM_NETWORK to K_C_LOCAL_NETWORK ...following feedback Test: FrameworksNetTests Change-Id: I9c25f0b066a58980bf071d2b958223ed609f0d8e --- framework/src/android/net/NetworkScore.java | 6 +++--- .../server/connectivityservice/CSKeepConnectedTest.kt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/framework/src/android/net/NetworkScore.java b/framework/src/android/net/NetworkScore.java index 00382f602b..935dea1348 100644 --- a/framework/src/android/net/NetworkScore.java +++ b/framework/src/android/net/NetworkScore.java @@ -46,7 +46,7 @@ public final class NetworkScore implements Parcelable { KEEP_CONNECTED_NONE, KEEP_CONNECTED_FOR_HANDOVER, KEEP_CONNECTED_FOR_TEST, - KEEP_CONNECTED_DOWNSTREAM_NETWORK + KEEP_CONNECTED_LOCAL_NETWORK }) public @interface KeepConnectedReason { } @@ -67,10 +67,10 @@ public final class NetworkScore implements Parcelable { public static final int KEEP_CONNECTED_FOR_TEST = 2; /** * Keep this network connected even if there is no outstanding request for it, because - * it is a downstream network. + * it is a local network. * @hide */ - public static final int KEEP_CONNECTED_DOWNSTREAM_NETWORK = 3; + public static final int KEEP_CONNECTED_LOCAL_NETWORK = 3; // Agent-managed policies // This network should lose to a wifi that has ever been validated diff --git a/tests/unit/java/com/android/server/connectivityservice/CSKeepConnectedTest.kt b/tests/unit/java/com/android/server/connectivityservice/CSKeepConnectedTest.kt index 6220e76409..2126a0946a 100644 --- a/tests/unit/java/com/android/server/connectivityservice/CSKeepConnectedTest.kt +++ b/tests/unit/java/com/android/server/connectivityservice/CSKeepConnectedTest.kt @@ -22,7 +22,7 @@ import android.net.NetworkCapabilities.NET_CAPABILITY_LOCAL_NETWORK import android.net.NetworkCapabilities.TRANSPORT_WIFI import android.net.NetworkRequest import android.net.NetworkScore -import android.net.NetworkScore.KEEP_CONNECTED_DOWNSTREAM_NETWORK +import android.net.NetworkScore.KEEP_CONNECTED_LOCAL_NETWORK import android.net.NetworkScore.KEEP_CONNECTED_FOR_TEST import android.os.Build import androidx.test.filters.SmallTest @@ -45,7 +45,7 @@ class CSKeepConnectedTest : CSTest() { .addCapability(NET_CAPABILITY_LOCAL_NETWORK) .build() val keepConnectedAgent = Agent(nc = nc, score = FromS(NetworkScore.Builder() - .setKeepConnectedReason(KEEP_CONNECTED_DOWNSTREAM_NETWORK) + .setKeepConnectedReason(KEEP_CONNECTED_LOCAL_NETWORK) .build()), lnc = LocalNetworkConfig.Builder().build()) val dontKeepConnectedAgent = Agent(nc = nc, lnc = LocalNetworkConfig.Builder().build())