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

Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" am: 6b674eea72 am: 3fa134a3f8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e255f46fc8b3d9fb3f4e1af4bd66b4a0e38369e
This commit is contained in:
Chiachang Wang
2020-12-28 02:02:08 +00:00
committed by Automerger Merge Worker
parent a12940d1ca 3fa134a3f8
commit 1db2093644
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1792,10 +1792,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
private INetworkManagementEventObserver mDataActivityObserver = new BaseNetworkObserver() {
@Override
public void interfaceClassDataActivityChanged(String label, boolean active, long tsNanos,
public void interfaceClassDataActivityChanged(int networkType, boolean active, long tsNanos,
int uid) {
int deviceType = Integer.parseInt(label);
sendDataActivityBroadcast(deviceType, active, tsNanos);
sendDataActivityBroadcast(networkType, active, tsNanos);
}
};

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

@@ -167,13 +167,13 @@ public class NetworkManagementServiceTest {
* Interface class activity.
*/
unsolListener.onInterfaceClassActivityChanged(true, 1, 1234, TEST_UID);
expectSoon(observer).interfaceClassDataActivityChanged("1", true, 1234, TEST_UID);
expectSoon(observer).interfaceClassDataActivityChanged(1, true, 1234, TEST_UID);
unsolListener.onInterfaceClassActivityChanged(false, 9, 5678, TEST_UID);
expectSoon(observer).interfaceClassDataActivityChanged("9", false, 5678, TEST_UID);
expectSoon(observer).interfaceClassDataActivityChanged(9, false, 5678, TEST_UID);
unsolListener.onInterfaceClassActivityChanged(false, 9, 4321, TEST_UID);
expectSoon(observer).interfaceClassDataActivityChanged("9", false, 4321, TEST_UID);
expectSoon(observer).interfaceClassDataActivityChanged(9, false, 4321, TEST_UID);
/**
* IP address changes.