summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author James Mattis <jmattis@google.com> 2020-11-15 20:22:01 -0800
committer James Mattis <jmattis@google.com> 2020-11-19 17:04:02 -0800
commit2d98b978eb570918e6b288a1f3388f30fb3893bb (patch)
treef344182c94d55ce93d03037980f7ac1650fee587
parent67087a4dcfc3a61c338d3497dcb2eb51bcd9389a (diff)
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
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 4480479979e4..6c95f2235551 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");
}