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

Merge "[IT04] Add uid as parameter of interfaceClassDataActivityChanged"

Browse Source
This commit is contained in:
Chiachang Wang
2020-12-23 05:20:33 +00:00
committed by Gerrit Code Review
parent a2e00f7c6f 45b100c541
commit 479e613095
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -1803,7 +1803,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
private INetworkManagementEventObserver mDataActivityObserver = new BaseNetworkObserver() { private INetworkManagementEventObserver mDataActivityObserver = new BaseNetworkObserver() {
@Override @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); int deviceType = Integer.parseInt(label);
sendDataActivityBroadcast(deviceType, active, tsNanos); sendDataActivityBroadcast(deviceType, active, tsNanos);
} }

17
tests/net/java/com/android/server/NetworkManagementServiceTest.java
View File

@@ -68,11 +68,12 @@ import java.util.function.BiFunction;
@SmallTest @SmallTest
public class NetworkManagementServiceTest { public class NetworkManagementServiceTest {
private NetworkManagementService mNMService; private NetworkManagementService mNMService;
@Mock private Context mContext; @Mock private Context mContext;
@Mock private IBatteryStats.Stub mBatteryStatsService; @Mock private IBatteryStats.Stub mBatteryStatsService;
@Mock private INetd.Stub mNetdService; @Mock private INetd.Stub mNetdService;
private static final int TEST_UID = 111;
@NonNull @NonNull
@Captor @Captor
private ArgumentCaptor<INetdUnsolicitedEventListener> mUnsolListenerCaptor; private ArgumentCaptor<INetdUnsolicitedEventListener> mUnsolListenerCaptor;
@@ -165,14 +166,14 @@ public class NetworkManagementServiceTest {
/** /**
* Interface class activity. * Interface class activity.
*/ */
unsolListener.onInterfaceClassActivityChanged(true, 1, 1234, 0); unsolListener.onInterfaceClassActivityChanged(true, 1, 1234, TEST_UID);
expectSoon(observer).interfaceClassDataActivityChanged("1", true, 1234); expectSoon(observer).interfaceClassDataActivityChanged("1", true, 1234, TEST_UID);
unsolListener.onInterfaceClassActivityChanged(false, 9, 5678, 0); unsolListener.onInterfaceClassActivityChanged(false, 9, 5678, TEST_UID);
expectSoon(observer).interfaceClassDataActivityChanged("9", false, 5678); expectSoon(observer).interfaceClassDataActivityChanged("9", false, 5678, TEST_UID);
unsolListener.onInterfaceClassActivityChanged(false, 9, 4321, 0); unsolListener.onInterfaceClassActivityChanged(false, 9, 4321, TEST_UID);
expectSoon(observer).interfaceClassDataActivityChanged("9", false, 4321); expectSoon(observer).interfaceClassDataActivityChanged("9", false, 4321, TEST_UID);
/** /**
* IP address changes. * IP address changes.
@@ -222,8 +223,6 @@ public class NetworkManagementServiceTest {
assertFalse(mNMService.isFirewallEnabled()); assertFalse(mNMService.isFirewallEnabled());
} }
private static final int TEST_UID = 111;
@Test @Test
public void testNetworkRestrictedDefault() { public void testNetworkRestrictedDefault() {
assertFalse(mNMService.isNetworkRestricted(TEST_UID)); assertFalse(mNMService.isNetworkRestricted(TEST_UID));