From b465e5c1162d5d68c1d1e025c727161ad64261bb Mon Sep 17 00:00:00 2001 From: James Mattis Date: Sun, 15 Nov 2020 20:22:01 -0800 Subject: [PATCH] Update toString() to use the correct request Update ConnectivityService.NetworkReassignment#toString to use either the current satisfier's request otherwise highest priority request when executing toString(). This is part of the mulilayered request changes. Bug: 173336774 Bug: 171991028 Test: atest FrameworksNetTests Change-Id: Ibed6cdd4522133164b2b919f62ecc9411943f026 --- services/core/java/com/android/server/ConnectivityService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 4480479979..6c95f22355 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -6814,7 +6814,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } public String toString() { - return mRequest.request.requestId + " : " + return mRequest.mRequests.get(0).requestId + " : " + (null != mOldNetwork ? mOldNetwork.network.netId : "null") + " → " + (null != mNewNetwork ? mNewNetwork.network.netId : "null"); }