summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chalard Jean <jchalard@google.com> 2021-03-01 22:06:04 +0900
committer Chalard Jean <jchalard@google.com> 2021-03-03 14:24:13 +0900
commit0e2d1fdb31e8459c215aeef610f1b228a37bcafb (patch)
tree0e9196ef4360436e8a804203908a6d906b7696e9
parent11bd0f5898e15831f630be665244f286292a83ab (diff)
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
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 1173592f5ce0..171ac13091ac 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");
}