summaryrefslogtreecommitdiff
path: root/tests/net/java/com/android/server
diff options
context:
space:
mode:
authorChiachang Wang <chiachangwang@google.com>2020-12-21 13:34:55 +0800
committerChiachang Wang <chiachangwang@google.com>2020-12-22 08:39:22 +0800
commit9c133bc4e97c6982ce889e131d64ede7dfc1748e (patch)
tree01763291768a30b7090ca5e648940e8bfa8cfdcf /tests/net/java/com/android/server
parent3f01a7a8c19f1e9450c001e67a6d0c5dc93aa187 (diff)
[IT04] Add uid as parameter of interfaceClassDataActivityChanged
Add uid into interfaceClassDataActivityChanged in INetworkManagementEventObserver. This helps the listeners to use BaseNetworkObserver to listen for target evnets instead of using whole INetdUnsolicitedEventListener with no-op in other event that listeners do not care about. Bug: 170598012 Test: m ; atest FrameworksNetTests Change-Id: I2a42a522c2ff9b1e0be88261a8574bb7f5292fa6
Diffstat (limited to 'tests/net/java/com/android/server')
-rw-r--r--tests/net/java/com/android/server/NetworkManagementServiceTest.java17
1 files changed, 8 insertions, 9 deletions
diff --git a/tests/net/java/com/android/server/NetworkManagementServiceTest.java b/tests/net/java/com/android/server/NetworkManagementServiceTest.java
index ea763d2e931e..e1502299ab05 100644
--- a/tests/net/java/com/android/server/NetworkManagementServiceTest.java
+++ b/tests/net/java/com/android/server/NetworkManagementServiceTest.java
@@ -68,11 +68,12 @@ import java.util.function.BiFunction;
@SmallTest
public class NetworkManagementServiceTest {
private NetworkManagementService mNMService;
-
@Mock private Context mContext;
@Mock private IBatteryStats.Stub mBatteryStatsService;
@Mock private INetd.Stub mNetdService;
+ private static final int TEST_UID = 111;
+
@NonNull
@Captor
private ArgumentCaptor<INetdUnsolicitedEventListener> mUnsolListenerCaptor;
@@ -165,14 +166,14 @@ public class NetworkManagementServiceTest {
/**
* Interface class activity.
*/
- unsolListener.onInterfaceClassActivityChanged(true, 1, 1234, 0);
- expectSoon(observer).interfaceClassDataActivityChanged("1", true, 1234);
+ unsolListener.onInterfaceClassActivityChanged(true, 1, 1234, TEST_UID);
+ expectSoon(observer).interfaceClassDataActivityChanged("1", true, 1234, TEST_UID);
- unsolListener.onInterfaceClassActivityChanged(false, 9, 5678, 0);
- expectSoon(observer).interfaceClassDataActivityChanged("9", false, 5678);
+ unsolListener.onInterfaceClassActivityChanged(false, 9, 5678, TEST_UID);
+ expectSoon(observer).interfaceClassDataActivityChanged("9", false, 5678, TEST_UID);
- unsolListener.onInterfaceClassActivityChanged(false, 9, 4321, 0);
- expectSoon(observer).interfaceClassDataActivityChanged("9", false, 4321);
+ unsolListener.onInterfaceClassActivityChanged(false, 9, 4321, TEST_UID);
+ expectSoon(observer).interfaceClassDataActivityChanged("9", false, 4321, TEST_UID);
/**
* IP address changes.
@@ -222,8 +223,6 @@ public class NetworkManagementServiceTest {
assertFalse(mNMService.isFirewallEnabled());
}
- private static final int TEST_UID = 111;
-
@Test
public void testNetworkRestrictedDefault() {
assertFalse(mNMService.isNetworkRestricted(TEST_UID));