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

Commit 41b8b89d authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Don't log meaningless caps change" am: adb6c2d4 am: ccfd7908 am:... 

Merge "Don't log meaningless caps change" am: adb6c2d4 am: ccfd7908 am: 37ee9aa9 am: 6e1f8a4d

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



Change-Id: I74fe78e6486ed8dabbda0f4bcd79b587fff1e703
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2a9b027 6e1f8a4d

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

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

                    }, 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 */

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

        public void onDefaultNetworkCapabilitiesChanged(@NonNull NetworkCapabilities nc) {

        public void onDefaultNetworkCapabilitiesChanged(@NonNull NetworkCapabilities nc) {

            if (significantCapsChange(mUnderlyingNetworkCapabilities, nc)) {

                // TODO : make this log terser

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

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

                        + mUnderlyingNetworkCapabilities + " to " + nc);

                        + mUnderlyingNetworkCapabilities + " to " + nc);

            }

            final NetworkCapabilities oldNc = mUnderlyingNetworkCapabilities;

            final NetworkCapabilities oldNc = mUnderlyingNetworkCapabilities;

            mUnderlyingNetworkCapabilities = nc;

            mUnderlyingNetworkCapabilities = nc;

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

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