diff options
| author | Frank Li <lifr@google.com> | 2022-03-02 08:20:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-02 08:20:49 +0000 |
| commit | 0c63b854e1f8a2fe54d7684cdd81c80f6e95247c (patch) | |
| tree | e38a0a7b9b5c77d60b420f33d121fa74e9be5659 /framework-t/src | |
| parent | 0b41b8bc5cbe67bc860ce4e818504cc7b6158d57 (diff) | |
| parent | 350414997d7b5593a4883f580ebe9cd807f5986d (diff) | |
Merge "[DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API" am: 2da74e0820
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004530
Change-Id: I8808a5ae604d0533385e8200d7b06ef43017d21a
Diffstat (limited to 'framework-t/src')
| -rw-r--r-- | framework-t/src/android/app/usage/NetworkStatsManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/framework-t/src/android/app/usage/NetworkStatsManager.java b/framework-t/src/android/app/usage/NetworkStatsManager.java index 0414bb79f8..a8baa8e488 100644 --- a/framework-t/src/android/app/usage/NetworkStatsManager.java +++ b/framework-t/src/android/app/usage/NetworkStatsManager.java @@ -699,7 +699,9 @@ public class NetworkStatsManager { * @hide */ @SystemApi - @RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) + @RequiresPermission(anyOf = { + NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, + android.Manifest.permission.NETWORK_STACK}) @NonNull public android.net.NetworkStats getMobileUidStats() { try { return mService.getUidStatsForTransport(TRANSPORT_CELLULAR); @@ -723,7 +725,9 @@ public class NetworkStatsManager { * @hide */ @SystemApi - @RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) + @RequiresPermission(anyOf = { + NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, + android.Manifest.permission.NETWORK_STACK}) @NonNull public android.net.NetworkStats getWifiUidStats() { try { return mService.getUidStatsForTransport(TRANSPORT_WIFI); |