commit 5a35cf9086381244900ccf60dff6d7f2e3941b6b
author Ken Chen <cken@google.com> Sat Oct 07 07:54:22 2023 +0800
committer Ken Chen <cken@google.com> Tue Oct 31 07:38:40 2023 +0000
tree bfd0b53411fe35ece41d182c0ee65ea4ce38401d
parent 792a7cd1a12afb2c9d209c0afaa608a7f648970f

Pass metered information to DNS resolver

Dns Resolver needs to know whether a network is metered when checking if
DNS requests will be blocked by Data Saver.

Bug: 288340533
Test: atest FrameworksNetTests
Change-Id: Ia5822dc522c766c7815680003c7ba275d15ccaff

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index dc09237..b31b94c 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -8898,7 +8898,7 @@
         // This network might have been underlying another network. Propagate its capabilities.
         propagateUnderlyingNetworkCapabilities(nai.network);
 
-        if (!newNc.equalsTransportTypes(prevNc)) {
+        if (meteredChanged || !newNc.equalsTransportTypes(prevNc)) {
             mDnsManager.updateCapabilitiesForNetwork(nai.network.getNetId(), newNc);
         }