Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Narrow access to getDataLayerSnapshotForUid()." into rvc-dev am: 735e0b26b7 am: b99479df46

Browse Source 
Change-Id: Ibb54af4f1e0e1bd42aa28900fbfa1dd4d0ffecf4
This commit is contained in:
TreeHugger Robot
2020-04-20 00:06:27 +00:00
committed by Automerger Merge Worker
parent a6b8457bb6 b99479df46
commit 6ebda2eaa9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -16,7 +16,6 @@
package com.android.server.net; package com.android.server.net;
import static android.Manifest.permission.ACCESS_NETWORK_STATE;
import static android.Manifest.permission.NETWORK_STATS_PROVIDER; import static android.Manifest.permission.NETWORK_STATS_PROVIDER;
import static android.Manifest.permission.READ_NETWORK_USAGE_HISTORY; import static android.Manifest.permission.READ_NETWORK_USAGE_HISTORY;
import static android.Manifest.permission.UPDATE_DEVICE_STATS; import static android.Manifest.permission.UPDATE_DEVICE_STATS;
@@ -855,7 +854,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override @Override
public NetworkStats getDataLayerSnapshotForUid(int uid) throws RemoteException { public NetworkStats getDataLayerSnapshotForUid(int uid) throws RemoteException {
if (Binder.getCallingUid() != uid) { if (Binder.getCallingUid() != uid) {
mContext.enforceCallingOrSelfPermission(ACCESS_NETWORK_STATE, TAG); Log.w(TAG, "Snapshots only available for calling UID");
return new NetworkStats(SystemClock.elapsedRealtime(), 0);
} }
// TODO: switch to data layer stats once kernel exports // TODO: switch to data layer stats once kernel exports