joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename KEEP_CONNECTED_DOWNSTREAM_NETWORK to K_C_LOCAL_NETWORK

Browse source 
...following feedback

Test: FrameworksNetTests
Change-Id: I9c25f0b066a58980bf071d2b958223ed609f0d8e
This commit is contained in:
Chalard Jean 2023-10-31 21:11:37 +09:00
commit 842a914dff
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
framework/src/android/net/NetworkScore.java
View file

@ -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

4
tests/unit/java/com/android/server/connectivityservice/CSKeepConnectedTest.kt
View file

@ -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())