From 521a139f7972cc5143beaa601a4999a4cb926a01 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Tue, 19 Jan 2021 15:04:23 +0900 Subject: [PATCH] Add a permission check for the default network connectivity metrics. This check was missed in aosp/1541935. Bug: 177656797 Test: atest FrameworksNetTests Change-Id: Idea00f16e56cff79897c142a4da3b07e3d93f379 --- .../com/android/server/connectivity/IpConnectivityMetrics.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java b/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java index 1024556c17eb4..26244e62696be 100644 --- a/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java +++ b/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java @@ -368,6 +368,7 @@ final public class IpConnectivityMetrics extends SystemService { @Override public void logDefaultNetworkValidity(boolean valid) { + NetworkStack.checkNetworkStackPermission(getContext()); mDefaultNetworkMetrics.logDefaultNetworkValidity(SystemClock.elapsedRealtime(), valid); } @@ -375,6 +376,7 @@ final public class IpConnectivityMetrics extends SystemService { public void logDefaultNetworkEvent(Network defaultNetwork, int score, boolean validated, LinkProperties lp, NetworkCapabilities nc, Network previousDefaultNetwork, int previousScore, LinkProperties previousLp, NetworkCapabilities previousNc) { + NetworkStack.checkNetworkStackPermission(getContext()); final long timeMs = SystemClock.elapsedRealtime(); mDefaultNetworkMetrics.logDefaultNetworkEvent(timeMs, defaultNetwork, score, validated, lp, nc, previousDefaultNetwork, previousScore, previousLp, previousNc);