Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0d79083 authored by Treehugger Robot's avatar Treehugger Robot Committed by Chalard Jean
Browse files

Allow the network stack to read network stats history 

Bug: 168984229
Test: testNetworkStatsProvider
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450457

Change-Id: Ic9bd2d2d06c790a84e56ec8a6915f1faab16dda0
Merged-In: Ibb6342b0f263c874bb1f7ab4031a639778bad37e
(cherry picked from commit 9010baec16faa806c2253f90225d002c4b2efb0c)
parent ef7605be

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

+5 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.app.admin.DeviceAdminInfo; 
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 @@ public final class NetworkStatsAccess { 
                        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;

        }