Merge "Add a permission check for the default network connectivity metrics."

This commit is contained in:
Treehugger Robot
2021-01-19 07:52:03 +00:00
committed by Gerrit Code Review

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);