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

Commit 7ffb9b40 authored by Chalard Jean's avatar Chalard Jean
Browse files

Don't log meaningless caps change 

The VPN events rotate very fast because the NC's estimate
of the bandwidth change a lot. Don't print these changes.

Test: manual
Change-Id: I70f0393fad90f43f827b94ac6bee236dff723b97
parent 995dda76

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

+19 −2
Original line number Diff line number Diff line
@@ -3825,10 +3825,27 @@ public class Vpn { 
                    }, retryDelayMs, TimeUnit.MILLISECONDS);

        }



        private boolean significantCapsChange(@Nullable final NetworkCapabilities left,

                @Nullable final NetworkCapabilities right) {

            if (left == right) return false;

            return null == left

                    || null == right

                    || !Arrays.equals(left.getTransportTypes(), right.getTransportTypes())

                    || !Arrays.equals(left.getCapabilities(), right.getCapabilities())

                    || !Arrays.equals(left.getEnterpriseIds(), right.getEnterpriseIds())

                    || !Objects.equals(left.getTransportInfo(), right.getTransportInfo())

                    || !Objects.equals(left.getAllowedUids(), right.getAllowedUids())

                    || !Objects.equals(left.getUnderlyingNetworks(), right.getUnderlyingNetworks())

                    || !Objects.equals(left.getNetworkSpecifier(), right.getNetworkSpecifier());

        }



        /** Called when the NetworkCapabilities of underlying network is changed */

        public void onDefaultNetworkCapabilitiesChanged(@NonNull NetworkCapabilities nc) {

            if (significantCapsChange(mUnderlyingNetworkCapabilities, nc)) {

                // TODO : make this log terser

                mEventChanges.log("[UnderlyingNW] Cap changed from "

                        + mUnderlyingNetworkCapabilities + " to " + nc);

            }

            final NetworkCapabilities oldNc = mUnderlyingNetworkCapabilities;

            mUnderlyingNetworkCapabilities = nc;

            if (oldNc == null || !nc.getSubscriptionIds().equals(oldNc.getSubscriptionIds())) {