commit 6b674eea72a5aeb42f0520e6fef046cf1a97b4e6
author Chiachang Wang <chiachangwang@google.com> Mon Dec 28 01:05:28 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 28 01:05:28 2020 +0000
tree 840b1e261aacf895ee7f4b889107074dcffbc51a
parent ea935361d5ded410b1f430c9d05cf0e326123bfc
parent 973313a3d5e2229ce784ec2c4d425f009b9579e9

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

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 542d043..fe116d9 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1792,10 +1792,9 @@
 
     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);
         }
     };
 

tests/net/java/com/android/server/NetworkManagementServiceTest.java

diff --git a/tests/net/java/com/android/server/NetworkManagementServiceTest.java b/tests/net/java/com/android/server/NetworkManagementServiceTest.java
index f3e23e8..13516d7 100644
--- a/tests/net/java/com/android/server/NetworkManagementServiceTest.java
+++ b/tests/net/java/com/android/server/NetworkManagementServiceTest.java
@@ -167,13 +167,13 @@
          * 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.