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

Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c am: 19542eea9e

Browse Source 
am: b7829c8fec

Change-Id: I2059d9cfa3015388301a74828255354b6dc23c23
This commit is contained in:
Remi NGUYEN VAN
2019-01-29 21:42:29 -08:00
committed by android-build-merger
parent d67edd1540 b7829c8fec
commit f71c4dfb77
4 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -57,6 +57,7 @@ import static android.net.NetworkPolicyManager.RULE_ALLOW_METERED;
import static android.net.NetworkPolicyManager.RULE_NONE;
import static android.net.NetworkPolicyManager.RULE_REJECT_ALL;
import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;
import static android.net.shared.NetworkParcelableUtil.fromStableParcelable;
import static com.android.internal.util.TestUtils.waitForIdleHandler;
import static com.android.internal.util.TestUtils.waitForIdleLooper;
@@ -119,6 +120,7 @@ import android.net.NetworkFactory;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
import android.net.NetworkMisc;
import android.net.NetworkParcelable;
import android.net.NetworkRequest;
import android.net.NetworkSpecifier;
import android.net.NetworkStack;
@@ -482,8 +484,8 @@ public class ConnectivityServiceTest {
fail(e.getMessage());
}
final ArgumentCaptor<Network> nmNetworkCaptor =
ArgumentCaptor.forClass(Network.class);
final ArgumentCaptor<NetworkParcelable> nmNetworkCaptor =
ArgumentCaptor.forClass(NetworkParcelable.class);
final ArgumentCaptor<INetworkMonitorCallbacks> nmCbCaptor =
ArgumentCaptor.forClass(INetworkMonitorCallbacks.class);
doNothing().when(mNetworkStack).makeNetworkMonitor(
@@ -523,7 +525,8 @@ public class ConnectivityServiceTest {
}
};
assertEquals(mNetworkAgent.netId, nmNetworkCaptor.getValue().netId);
assertEquals(
mNetworkAgent.netId, fromStableParcelable(nmNetworkCaptor.getValue()).netId);
mNmCallbacks = nmCbCaptor.getValue();
try {