Snap for 6410067 from 23b52c4f47eced4dca86093f5c48419bef3103f5 to mainline-release

Change-Id: Ic8cf0fcd7ffdfd54385982bb890d0ebd3c485181
This commit is contained in:
android-build-team Robot
2020-04-20 07:15:41 +00:00

View File

@@ -16,7 +16,6 @@
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.READ_NETWORK_USAGE_HISTORY;
import static android.Manifest.permission.UPDATE_DEVICE_STATS;
@@ -855,7 +854,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override
public NetworkStats getDataLayerSnapshotForUid(int uid) throws RemoteException {
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