LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Move NetworkCallback to last parameter for new exposed requestNetwork" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-19 13:40:51 +00:00
committed by Android (Google) Code Review
parent 8a0af9515d ac580f9826
commit f80f541d16
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java
View File

@@ -244,7 +244,8 @@ public class UpstreamNetworkMonitor {
// Additionally, we log a message to aid in any subsequent debugging. // Additionally, we log a message to aid in any subsequent debugging.
mLog.i("requesting mobile upstream network: " + mobileUpstreamRequest); 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. */ /** Release mobile network request. */

8
Tethering/tests/unit/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java
View File

@@ -212,8 +212,8 @@ public class UpstreamNetworkMonitorTest {
mUNM.updateMobileRequiresDun(true); mUNM.updateMobileRequiresDun(true);
mUNM.registerMobileNetworkRequest(); mUNM.registerMobileNetworkRequest();
verify(mCM, times(1)).requestNetwork( verify(mCM, times(1)).requestNetwork(
any(NetworkRequest.class), any(NetworkCallback.class), anyInt(), anyInt(), any(NetworkRequest.class), anyInt(), anyInt(), any(Handler.class),
any(Handler.class)); any(NetworkCallback.class));
assertTrue(mUNM.mobileNetworkRequested()); assertTrue(mUNM.mobileNetworkRequested());
assertUpstreamTypeRequested(TYPE_MOBILE_DUN); assertUpstreamTypeRequested(TYPE_MOBILE_DUN);
@@ -649,8 +649,8 @@ public class UpstreamNetworkMonitorTest {
} }
@Override @Override
public void requestNetwork(NetworkRequest req, NetworkCallback cb, public void requestNetwork(NetworkRequest req,
int timeoutMs, int legacyType, Handler h) { int timeoutMs, int legacyType, Handler h, NetworkCallback cb) {
assertFalse(allCallbacks.containsKey(cb)); assertFalse(allCallbacks.containsKey(cb));
allCallbacks.put(cb, h); allCallbacks.put(cb, h);
assertFalse(requested.containsKey(cb)); assertFalse(requested.containsKey(cb));