joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged"

Browse source
This commit is contained in:
Chiachang Wang 2020-12-28 01:05:28 +00:00 • committed by Gerrit Code Review
commit 6b674eea72
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.