From cd7634501f0a12710b5905c5eddc2ecd120c96fc Mon Sep 17 00:00:00 2001 From: James Mattis Date: Thu, 19 Nov 2020 17:06:18 -0800 Subject: [PATCH] maybeLogBlockedStatusChanged multilayer requests Updating maybeLogBlockedStatusChanged logging so that it outputs the currently active request's information as part of the multilayared requests updates. Bug: 173145245 Bug: 171991028 Test: atest FrameworksNetTests Change-Id: I68f364b457e0e5ac8f47df4a4356e4bc25360bca --- .../core/java/com/android/server/ConnectivityService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index be4464790c..cf3ca65f31 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1376,8 +1376,11 @@ public class ConnectivityService extends IConnectivityManager.Stub return; } final String action = blocked ? "BLOCKED" : "UNBLOCKED"; + final NetworkRequest satisfiedRequest = nri.getSatisfiedRequest(); + int requestId = satisfiedRequest != null + ? satisfiedRequest.requestId : nri.mRequests.get(0).requestId; mNetworkInfoBlockingLogs.log(String.format( - "%s %d(%d) on netId %d", action, nri.mUid, nri.request.requestId, net.getNetId())); + "%s %d(%d) on netId %d", action, nri.mUid, requestId, net.getNetId())); } /**