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

Merge changes I3ba50cbd,I970ee365 am: 37f2408143 am: 0d3416dcea

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

Change-Id: If9a3e37e5359b955e330002d81cbeb48f90ee22b
This commit is contained in:
Junyu Lai
2021-05-15 17:24:42 +00:00
committed by Automerger Merge Worker
parent 5826897604 0d3416dcea
commit f28cadc9d0
3 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/app/usage/NetworkStatsManager.java
View File

@@ -655,14 +655,14 @@ public class NetworkStatsManager {
}
/**
* Notify {@code NetworkStatsService} about network status changed.
* Notify {@code NetworkStatsService} about network status changed.
*
* Notifies NetworkStatsService of network state changes for data usage accounting purposes.
* Notifies NetworkStatsService of network state changes for data usage accounting purposes.
*
* To avoid races that attribute data usage to wrong network, such as new network with
* the same interface after SIM hot-swap, this function will not return until
* {@code NetworkStatsService} finishes its work of retrieving traffic statistics from
* all data sources.
* To avoid races that attribute data usage to wrong network, such as new network with
* the same interface after SIM hot-swap, this function will not return until
* {@code NetworkStatsService} finishes its work of retrieving traffic statistics from
* all data sources.
*
* @param defaultNetworks the list of all networks that could be used by network traffic that
* does not explicitly select a network.
@@ -689,8 +689,7 @@ public class NetworkStatsManager {
Objects.requireNonNull(defaultNetworks);
Objects.requireNonNull(networkStateSnapshots);
Objects.requireNonNull(underlyingNetworkInfos);
// TODO: Change internal namings after the name is decided.
mService.forceUpdateIfaces(defaultNetworks.toArray(new Network[0]),
mService.notifyNetworkStatus(defaultNetworks.toArray(new Network[0]),
networkStateSnapshots.toArray(new NetworkStateSnapshot[0]), activeIface,
underlyingNetworkInfos.toArray(new UnderlyingNetworkInfo[0]));
} catch (RemoteException e) {

4
core/java/android/net/INetworkStatsService.aidl
View File

@@ -65,8 +65,8 @@ interface INetworkStatsService {
/** Increment data layer count of operations performed for UID and tag. */
void incrementOperationCount(int uid, int tag, int operationCount);
/** Force update of ifaces. */
void forceUpdateIfaces(
/** Notify {@code NetworkStatsService} about network status changed. */
void notifyNetworkStatus(
in Network[] defaultNetworks,
in NetworkStateSnapshot[] snapshots,
in String activeIface,