From b9128f36a5513215981085edf01d17e28b0a225f Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Fri, 26 Jun 2020 07:48:13 +0000 Subject: [PATCH] Send ConnDiags event before revalidating network in CS. This change updates ConnectivityService to notify the ConnectivityDiagnosticsHandler of app-reported connectivity before attempting to revalidate the network. This change forces an ordering on Connectivity Diagnostics events in the case that the reported connectivity does not match the known connectivity for the network - this leads to the network being revalidated and the ConnectivityDiagnostics event onConnectivityReportAvailable. Passing the onNetworkConnectivityReported event to the ConnectivityDiagnosticsHandler first ensures that it is passed to callbacks before any potential ConnectivityReports are. Bug: 159718782 Test: android.net.cts.ConnectivityDiagnosticsManagerTest Original-Change: https://android-review.googlesource.com/1350662 Merged-In: Ic7bc7138c54c47bbfdf56af5811709fde66f8606 Change-Id: Ic7bc7138c54c47bbfdf56af5811709fde66f8606 --- .../java/com/android/server/ConnectivityService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 01b2e691d4..77cd5d2ffd 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -4323,9 +4323,11 @@ public class ConnectivityService extends IConnectivityManager.Stub enforceInternetPermission(); final int uid = Binder.getCallingUid(); final int connectivityInfo = encodeBool(hasConnectivity); - mHandler.sendMessage( - mHandler.obtainMessage(EVENT_REVALIDATE_NETWORK, uid, connectivityInfo, network)); + // Handle ConnectivityDiagnostics event before attempting to revalidate the network. This + // forces an ordering of ConnectivityDiagnostics events in the case where hasConnectivity + // does not match the known connectivity of the network - this causes NetworkMonitor to + // revalidate the network and generate a ConnectivityDiagnostics ConnectivityReport event. final NetworkAgentInfo nai; if (network == null) { nai = getDefaultNetwork(); @@ -4338,6 +4340,9 @@ public class ConnectivityService extends IConnectivityManager.Stub ConnectivityDiagnosticsHandler.EVENT_NETWORK_CONNECTIVITY_REPORTED, connectivityInfo, 0, nai)); } + + mHandler.sendMessage( + mHandler.obtainMessage(EVENT_REVALIDATE_NETWORK, uid, connectivityInfo, network)); } private void handleReportNetworkConnectivity(