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

Merge "Add a permission check for the default network connectivity metrics." am: 20e113e316

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I557bc8d196bc18a05fa50d637ddc53ad01fe943e
This commit is contained in:
Treehugger Robot
2021-01-19 08:37:24 +00:00
committed by Automerger Merge Worker
parent e9d6a427fe 20e113e316
commit 1d32a861eb
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java
View File

@@ -368,6 +368,7 @@ final public class IpConnectivityMetrics extends SystemService {
@Override @Override
public void logDefaultNetworkValidity(boolean valid) { public void logDefaultNetworkValidity(boolean valid) {
NetworkStack.checkNetworkStackPermission(getContext());
mDefaultNetworkMetrics.logDefaultNetworkValidity(SystemClock.elapsedRealtime(), valid); mDefaultNetworkMetrics.logDefaultNetworkValidity(SystemClock.elapsedRealtime(), valid);
} }
@@ -375,6 +376,7 @@ final public class IpConnectivityMetrics extends SystemService {
public void logDefaultNetworkEvent(Network defaultNetwork, int score, boolean validated, public void logDefaultNetworkEvent(Network defaultNetwork, int score, boolean validated,
LinkProperties lp, NetworkCapabilities nc, Network previousDefaultNetwork, LinkProperties lp, NetworkCapabilities nc, Network previousDefaultNetwork,
int previousScore, LinkProperties previousLp, NetworkCapabilities previousNc) { int previousScore, LinkProperties previousLp, NetworkCapabilities previousNc) {
NetworkStack.checkNetworkStackPermission(getContext());
final long timeMs = SystemClock.elapsedRealtime(); final long timeMs = SystemClock.elapsedRealtime();
mDefaultNetworkMetrics.logDefaultNetworkEvent(timeMs, defaultNetwork, score, validated, mDefaultNetworkMetrics.logDefaultNetworkEvent(timeMs, defaultNetwork, score, validated,
lp, nc, previousDefaultNetwork, previousScore, previousLp, previousNc); lp, nc, previousDefaultNetwork, previousScore, previousLp, previousNc);