Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions 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 b1de9a09bd 9c133bc4e9
commit baef452e38
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/net/INetworkManagementEventObserver.aidl
View File

@@ -85,11 +85,14 @@ oneway interface INetworkManagementEventObserver {
/** /**
* Interface data activity status is changed. * Interface data activity status is changed.
* *
* @param iface The interface. * @param label Unique identifier indicates the network type of the data activity change.
* @param active True if the interface is actively transmitting data, false if it is idle. * @param active True if the interface is actively transmitting data, false if it is idle.
* @param tsNanos Elapsed realtime in nanos when the state of the network interface changed. * @param tsNanos Elapsed realtime in nanos when the state of the network interface changed.
* @param uid Uid of this event. It represents the uid that was responsible for waking the
* radio. For those events that are reported by system itself, not from specific uid,
* use -1 for the events which means no uid.
*/ */
void interfaceClassDataActivityChanged(String label, boolean active, long tsNanos); void interfaceClassDataActivityChanged(String label, boolean active, long tsNanos, int uid);
/** /**
* Information about available DNS servers has been received. * Information about available DNS servers has been received.

3
core/java/com/android/server/net/BaseNetworkObserver.java
View File

@@ -64,7 +64,8 @@ public class BaseNetworkObserver extends INetworkManagementEventObserver.Stub {
} }
@Override @Override
public void interfaceClassDataActivityChanged(String label, boolean active, long tsNanos) { public void interfaceClassDataActivityChanged(String label, boolean active, long tsNanos,
int uid) {
// default no-op // default no-op
} }

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);
} }

2
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -438,7 +438,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
// the radio is the authority for the current state. // the radio is the authority for the current state.
final boolean active = isActive; final boolean active = isActive;
invokeForAllObservers(o -> o.interfaceClassDataActivityChanged( invokeForAllObservers(o -> o.interfaceClassDataActivityChanged(
Integer.toString(type), active, tsNanos)); Integer.toString(type), active, tsNanos, uid));
} }
boolean report = false; boolean report = false;

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));