Update uid state used for bucketizing data in fg vs bg states.
Currently we are using PROCESS_STATE_BOUND_FOREGROUND_SERVICE to
decide whether to allow network access for an uid or not but
PROCESS_STATE_TOP is used for bucketizing data in fg vs bg states.
It's possible that even though user restricts background data uasge
for an app, the bg data usage amount displayed to the user is > 0.
As this could be confusing, use PROCESS_STATE_BOUND_FOREGROUND_SERVICE
for bucketizing in fg vs bg states too.
Bug: 63907204
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Test: manual
Change-Id: Ib506e421043fbe1052b6d0068ebf01d288faba21
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 8febecf..5a05423 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -3203,20 +3203,14 @@
this, in, out, err, args, callback, resultReceiver);
}
- @Override
+ @VisibleForTesting
public boolean isUidForeground(int uid) {
- mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG);
-
synchronized (mUidRulesFirstLock) {
- return isUidForegroundUL(uid);
+ return isUidStateForeground(
+ mUidState.get(uid, ActivityManager.PROCESS_STATE_CACHED_EMPTY));
}
}
- private boolean isUidForegroundUL(int uid) {
- return isUidStateForegroundUL(
- mUidState.get(uid, ActivityManager.PROCESS_STATE_CACHED_EMPTY));
- }
-
private boolean isUidForegroundOnRestrictBackgroundUL(int uid) {
final int procState = mUidState.get(uid, ActivityManager.PROCESS_STATE_CACHED_EMPTY);
return isProcStateAllowedWhileOnRestrictBackground(procState);
@@ -3227,9 +3221,9 @@
return isProcStateAllowedWhileIdleOrPowerSaveMode(procState);
}
- private boolean isUidStateForegroundUL(int state) {
+ private boolean isUidStateForeground(int state) {
// only really in foreground when screen is also on
- return state <= ActivityManager.PROCESS_STATE_TOP;
+ return state <= NetworkPolicyManager.FOREGROUND_THRESHOLD_STATE;
}
/**
@@ -3256,7 +3250,7 @@
}
updateRulesForPowerRestrictionsUL(uid);
}
- updateNetworkStats(uid, isUidStateForegroundUL(uidState));
+ updateNetworkStats(uid, isUidStateForeground(uidState));
}
} finally {
Trace.traceEnd(Trace.TRACE_TAG_NETWORK);