commit 7e4a864f605bf0e1f5b2f85cd3ef23402ea7ec58
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 16 04:12:51 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 16 04:12:51 2020 +0000
tree 34dfc0a07a103ceb000029f68f03484f9e0b6908
parent 05e92bb5ef7c0a288b238f169b064ead0c9ccde0
parent f1e2cf02aeba94f8417253698e68f98d0c141eef

Merge "Allow the network stack to read network stats history"

services/core/java/com/android/server/net/NetworkStatsAccess.java

diff --git a/services/core/java/com/android/server/net/NetworkStatsAccess.java b/services/core/java/com/android/server/net/NetworkStatsAccess.java
index 7c1c1c7..72559b4 100644
--- a/services/core/java/com/android/server/net/NetworkStatsAccess.java
+++ b/services/core/java/com/android/server/net/NetworkStatsAccess.java
@@ -28,6 +28,7 @@
 import android.app.admin.DevicePolicyManagerInternal;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.os.Process;
 import android.os.UserHandle;
 import android.telephony.TelephonyManager;
 
@@ -113,10 +114,11 @@
                         TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS;
         boolean isDeviceOwner = dpmi != null && dpmi.isActiveAdminWithPolicy(callingUid,
                 DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
+        final int appId = UserHandle.getAppId(callingUid);
         if (hasCarrierPrivileges || isDeviceOwner
-                || UserHandle.getAppId(callingUid) == android.os.Process.SYSTEM_UID) {
-            // Carrier-privileged apps and device owners, and the system can access data usage for
-            // all apps on the device.
+                || appId == Process.SYSTEM_UID || appId == Process.NETWORK_STACK_UID) {
+            // Carrier-privileged apps and device owners, and the system (including the
+            // network stack) can access data usage for all apps on the device.
             return NetworkStatsAccess.Level.DEVICE;
         }