From f2d2aac68deb47472a5fd7e9a4e958694dc2a3d1 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Mon, 21 Dec 2020 18:07:39 +0800 Subject: [PATCH] [IT4.2] Update argument type of interfaceClassDataActivityChanged The argument type of interfaceClassDataActivityChanged takes a string for the network type. It requires both the receivers and NMS to do type transformation. The transformation is a redundant work. Update it to take integer directly and rename to understandable naming. Bug: 170598012 Test: atest FrameworksNetTests Change-Id: Ibe9fa7a1b71af2dab916b5d615742e77e4174c39 --- .../core/java/com/android/server/ConnectivityService.java | 5 ++--- .../com/android/server/NetworkManagementServiceTest.java | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 5afbb89950..3de049ed94 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1803,10 +1803,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); } }; diff --git a/tests/net/java/com/android/server/NetworkManagementServiceTest.java b/tests/net/java/com/android/server/NetworkManagementServiceTest.java index e1502299ab..2fcd21f2b7 100644 --- a/tests/net/java/com/android/server/NetworkManagementServiceTest.java +++ b/tests/net/java/com/android/server/NetworkManagementServiceTest.java @@ -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.