LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use "don't actively prefer" timeout when avoiding bad wifi

Browse Source 
Test: ConnectivityServiceTest
Change-Id: I6e99aff77c55805630d878e472f466bd31bba360
This commit is contained in:
Chalard Jean
2023-05-15 17:26:13 +09:00
parent adc6ab5c45
commit 6f6c353baf
2 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
service/src/com/android/server/ConnectivityService.java
View File

@@ -1519,6 +1519,23 @@ public class ConnectivityService extends IConnectivityManager.Stub
throws SocketException, InterruptedIOException, ErrnoException {
InetDiagMessage.destroyLiveTcpSocketsByOwnerUids(ownerUids);
}
/**
* Schedule the evaluation timeout.
*
* When a network connects, it's "not evaluated" yet. Detection events cause the network
* to be "evaluated" (typically, validation or detection of a captive portal). If none
* of these events happen, this time will run out, after which the network is considered
* "evaluated" even if nothing happened to it. Notionally that means the system gave up
* on this network and considers it won't provide connectivity. In particular, that means
* it's when the system prefers it to cell if it's wifi and configuration says it should
* prefer bad wifi to cell.
*/
public void scheduleEvaluationTimeout(@NonNull Handler handler,
@NonNull final Network network, final long delayMs) {
handler.sendMessageDelayed(
handler.obtainMessage(EVENT_INITIAL_EVALUATION_TIMEOUT, network), delayMs);
}
}
public ConnectivityService(Context context) {
@@ -5273,8 +5290,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
/** Schedule evaluation timeout */
@VisibleForTesting
public void scheduleEvaluationTimeout(@NonNull final Network network, final long delayMs) {
mHandler.sendMessageDelayed(
mHandler.obtainMessage(EVENT_INITIAL_EVALUATION_TIMEOUT, network), delayMs);
mDeps.scheduleEvaluationTimeout(mHandler, network, delayMs);
}
@Override
@@ -9826,7 +9842,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
networkAgent.networkMonitor().notifyNetworkConnected(params.linkProperties,
params.networkCapabilities);
}
final long delay = activelyPreferBadWifi()
final long delay = !avoidBadWifi() && activelyPreferBadWifi()
? ACTIVELY_PREFER_BAD_WIFI_INITIAL_TIMEOUT_MS
: DONT_ACTIVELY_PREFER_BAD_WIFI_INITIAL_TIMEOUT_MS;
scheduleEvaluationTimeout(networkAgent.network, delay);