summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author junyulai <junyulai@google.com> 2019-04-08 16:58:22 +0800
committer junyulai <junyulai@google.com> 2019-04-08 17:15:52 +0800
commit26b7664c4311dbc389188be06ce37b91267ba181 (patch)
treefdac2eb8883f50da95b6404b8178dcd1e79261cc
parent1178972d68144489b4bf709549da38ca355cc317 (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: Ifd18d1c6ad708c1dbc793f03d8241f572af50317
-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 9d2965afdbca..88955d7e4667 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6554,7 +6554,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++) {