From ac580f982636ef522f3b435bf26f8bd7f50aa589 Mon Sep 17 00:00:00 2001 From: markchien Date: Wed, 18 Mar 2020 21:16:15 +0800 Subject: [PATCH] Move NetworkCallback to last parameter for new exposed requestNetwork Bug: 151243698 Test: atest TetheringTests Change-Id: I87ef1d451eefa6998b9793c4eacabae978376d24 --- .../connectivity/tethering/UpstreamNetworkMonitor.java | 3 ++- .../tethering/UpstreamNetworkMonitorTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java b/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java index 2875f71e5e..7ac7f5f06e 100644 --- a/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java +++ b/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java @@ -244,7 +244,8 @@ public class UpstreamNetworkMonitor { // Additionally, we log a message to aid in any subsequent debugging. mLog.i("requesting mobile upstream network: " + mobileUpstreamRequest); - cm().requestNetwork(mobileUpstreamRequest, mMobileNetworkCallback, 0, legacyType, mHandler); + cm().requestNetwork(mobileUpstreamRequest, 0, legacyType, mHandler, + mMobileNetworkCallback); } /** Release mobile network request. */ diff --git a/Tethering/tests/unit/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java b/Tethering/tests/unit/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java index 5ed75bf26f..7c98f626a4 100644 --- a/Tethering/tests/unit/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java +++ b/Tethering/tests/unit/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java @@ -212,8 +212,8 @@ public class UpstreamNetworkMonitorTest { mUNM.updateMobileRequiresDun(true); mUNM.registerMobileNetworkRequest(); verify(mCM, times(1)).requestNetwork( - any(NetworkRequest.class), any(NetworkCallback.class), anyInt(), anyInt(), - any(Handler.class)); + any(NetworkRequest.class), anyInt(), anyInt(), any(Handler.class), + any(NetworkCallback.class)); assertTrue(mUNM.mobileNetworkRequested()); assertUpstreamTypeRequested(TYPE_MOBILE_DUN); @@ -649,8 +649,8 @@ public class UpstreamNetworkMonitorTest { } @Override - public void requestNetwork(NetworkRequest req, NetworkCallback cb, - int timeoutMs, int legacyType, Handler h) { + public void requestNetwork(NetworkRequest req, + int timeoutMs, int legacyType, Handler h, NetworkCallback cb) { assertFalse(allCallbacks.containsKey(cb)); allCallbacks.put(cb, h); assertFalse(requested.containsKey(cb));