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

Merge "[DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API" am: 2da74e0820

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004530

Change-Id: I8808a5ae604d0533385e8200d7b06ef43017d21a
This commit is contained in:
Frank Li
2022-03-02 08:20:49 +00:00
committed by Automerger Merge Worker
parent 0b41b8bc5c 350414997d
commit 0c63b854e1
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -699,7 +699,9 @@ public class NetworkStatsManager {
* @hide * @hide
*/ */
@SystemApi @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() { @NonNull public android.net.NetworkStats getMobileUidStats() {
try { try {
return mService.getUidStatsForTransport(TRANSPORT_CELLULAR); return mService.getUidStatsForTransport(TRANSPORT_CELLULAR);
@@ -723,7 +725,9 @@ public class NetworkStatsManager {
* @hide * @hide
*/ */
@SystemApi @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() { @NonNull public android.net.NetworkStats getWifiUidStats() {
try { try {
return mService.getUidStatsForTransport(TRANSPORT_WIFI); return mService.getUidStatsForTransport(TRANSPORT_WIFI);

2
service-t/src/com/android/server/net/NetworkStatsService.java
View File

@@ -1123,7 +1123,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override @Override
public NetworkStats getUidStatsForTransport(int transport) { public NetworkStats getUidStatsForTransport(int transport) {
enforceAnyPermissionOf(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK); PermissionUtils.enforceNetworkStackPermission(mContext);
try { try {
final String[] relevantIfaces = final String[] relevantIfaces =
transport == TRANSPORT_WIFI ? mWifiIfaces : mMobileIfaces; transport == TRANSPORT_WIFI ? mWifiIfaces : mMobileIfaces;