summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Junyu Lai <junyulai@google.com> 2019-04-09 08:59:00 -0700
committer Junyu Lai <junyulai@google.com> 2019-04-10 03:23:58 +0000
commitc685f505513a39db0c0ffec85eef6d3a3cb58737 (patch)
treecea7c128a7fd2fc3f845da0f5a1c68729ab663d4
parent21df04365d9350c5d51f6fc1022590dbbcf30b34 (diff)
Fix onBlockedStatusChanged does not work on multiple networks
There is a logic error in maybeNotifyNetworkBlockedForNewUidRules that caused function to return if there is no status change in the first network. This would cause CTS failed in devices which has volte-enabled SIM inserted. Bug: 129409153 Fix: 117969394 Test: 1. atest com.android.cts.net.HostsideNetworkCallbackTests \ --generate-new-metrics 20 2. atest FrameworksNetTests Change-Id: I11168fd07a7c29e0605f2e874e9d9f41b5ad88b6 Merged-In: Ifd18d1c6ad708c1dbc793f03d8241f572af50317 (cherry picked from commit 794f01c7266275fa4b22a5ce37fe992535d04463)
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 57de67e1a38c..f5490d777e9b 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6543,7 +6543,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
uid, newRules, metered, mRestrictBackground);
}
if (oldBlocked == newBlocked) {
- return;
+ continue;
}
final int arg = encodeBool(newBlocked);
for (int i = 0; i < nai.numNetworkRequests(); i++) {