Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d32a861 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I557bc8d196bc18a05fa50d637ddc53ad01fe943e
parents e9d6a427 20e113e3

services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java

+2 −0
Original line number Diff line number Diff line
@@ -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);