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

Merge "[MS68.1] Register usage callback from NetworkPolicyManagerService"

Browse Source
This commit is contained in:
Junyu Lai
2022-01-25 13:30:57 +00:00
committed by Gerrit Code Review
parent 121c4fc872 f6487fb3c1
commit 0534b453bc
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework-t/src/android/app/usage/NetworkStatsManager.java
View File

@@ -729,7 +729,8 @@ public class NetworkStatsManager {
* {@link #unregisterUsageCallback} is called. * {@link #unregisterUsageCallback} is called.
* *
* @param template Template used to match networks. See {@link NetworkTemplate}. * @param template Template used to match networks. See {@link NetworkTemplate}.
* @param thresholdBytes Threshold in bytes to be notified on. * @param thresholdBytes Threshold in bytes to be notified on. The provided value that lower
* than 2MiB will be clamped for non-privileged callers.
* @param executor The executor on which callback will be invoked. The provided {@link Executor} * @param executor The executor on which callback will be invoked. The provided {@link Executor}
* must run callback sequentially, otherwise the order of callbacks cannot be * must run callback sequentially, otherwise the order of callbacks cannot be
* guaranteed. * guaranteed.

12
service-t/src/com/android/server/net/NetworkStatsObservers.java
View File

@@ -76,7 +76,7 @@ class NetworkStatsObservers {
*/ */
public DataUsageRequest register(DataUsageRequest inputRequest, IUsageCallback callback, public DataUsageRequest register(DataUsageRequest inputRequest, IUsageCallback callback,
int callingUid, @NetworkStatsAccess.Level int accessLevel) { int callingUid, @NetworkStatsAccess.Level int accessLevel) {
DataUsageRequest request = buildRequest(inputRequest); DataUsageRequest request = buildRequest(inputRequest, callingUid);
RequestInfo requestInfo = buildRequestInfo(request, callback, callingUid, RequestInfo requestInfo = buildRequestInfo(request, callback, callingUid,
accessLevel); accessLevel);
@@ -194,10 +194,12 @@ class NetworkStatsObservers {
} }
} }
private DataUsageRequest buildRequest(DataUsageRequest request) { private DataUsageRequest buildRequest(DataUsageRequest request, int callingUid) {
// Cap the minimum threshold to a safe default to avoid too many callbacks // For non-system uid, cap the minimum threshold to a safe default to avoid too
long thresholdInBytes = Math.max(MIN_THRESHOLD_BYTES, request.thresholdInBytes); // many callbacks.
if (thresholdInBytes < request.thresholdInBytes) { long thresholdInBytes = (callingUid == Process.SYSTEM_UID ? request.thresholdInBytes
: Math.max(MIN_THRESHOLD_BYTES, request.thresholdInBytes));
if (thresholdInBytes > request.thresholdInBytes) {
Log.w(TAG, "Threshold was too low for " + request Log.w(TAG, "Threshold was too low for " + request
+ ". Overriding to a safer default of " + thresholdInBytes + " bytes"); + ". Overriding to a safer default of " + thresholdInBytes + " bytes");
} }