From ad0a6e6368df144f3addd737adc7e43da8abdb5e Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Mon, 1 Mar 2021 22:06:04 +0900 Subject: [PATCH] Fix a bug in RequestReassignment#toString This fixes a small bug in debug code where the wrong request would be displayed for RequestReassignment#toString. Test: manual Change-Id: Ie8d983593e67082eb818ef65bd8708e97596bce2 --- .../core/java/com/android/server/ConnectivityService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 1173592f5c..171ac13091 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -7222,7 +7222,9 @@ public class ConnectivityService extends IConnectivityManager.Stub } public String toString() { - return mNetworkRequestInfo.mRequests.get(0).requestId + " : " + final NetworkRequest requestToShow = null != mNewNetworkRequest + ? mNewNetworkRequest : mNetworkRequestInfo.mRequests.get(0); + return requestToShow.requestId + " : " + (null != mOldNetwork ? mOldNetwork.network.getNetId() : "null") + " → " + (null != mNewNetwork ? mNewNetwork.network.getNetId() : "null"); }