Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't log meaningless caps change"

Browse Source
This commit is contained in:
Chiachang Wang
2023-05-24 01:40:34 +00:00
committed by Gerrit Code Review
parent 10bfdb5c4f 7ffb9b402c
commit adb6c2d4b8
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -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())) {