commit ad0a6e6368df144f3addd737adc7e43da8abdb5e
author Chalard Jean <jchalard@google.com> Mon Mar 01 22:06:04 2021 +0900
committer Chalard Jean <jchalard@google.com> Wed Mar 03 14:24:13 2021 +0900
tree 33837066fe5a6b7f12c19285b10cf6da57712e4f
parent dc97407cfcfafbd7c90f649192fc62cd22737c6b

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

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 1173592..171ac13 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -7222,7 +7222,9 @@
             }
 
             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");
             }