From f896dfcb81ac85da1b211555ee31d4ba8546382a Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Mon, 21 Dec 2020 13:34:55 +0800 Subject: [PATCH] [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 --- .../com/android/server/ConnectivityService.java | 3 ++- .../server/NetworkManagementServiceTest.java | 17 ++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 52df42fbbc..5afbb89950 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1803,7 +1803,8 @@ public class ConnectivityService extends IConnectivityManager.Stub private INetworkManagementEventObserver mDataActivityObserver = new BaseNetworkObserver() { @Override - public void interfaceClassDataActivityChanged(String label, boolean active, long tsNanos) { + public void interfaceClassDataActivityChanged(String label, boolean active, long tsNanos, + int uid) { int deviceType = Integer.parseInt(label); sendDataActivityBroadcast(deviceType, active, tsNanos); } diff --git a/tests/net/java/com/android/server/NetworkManagementServiceTest.java b/tests/net/java/com/android/server/NetworkManagementServiceTest.java index ea763d2e93..e1502299ab 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 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));