summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Lin <lucaslin@google.com> 2020-11-20 02:11:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-20 02:11:32 +0000
commitcf6db35e978c2057a48b3a930efbe3b19dff54e8 (patch)
tree1176d863abc68a0fff46bb2826b22ef90f937bcb
parentb71d2d2c8546e895e99669a099d16b67b70633ec (diff)
parent9a2e010bb5b7f75e27b6998fde4694d08ecf07ed (diff)
Merge "Remove a comment from ConnectivityService" am: 7ed22093fa am: 9a2e010bb5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494040 Change-Id: I5438ae75425761d4f25123b52f3329f272145c14
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index fba1e79ad79a..d275d65c05de 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5854,7 +5854,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
@GuardedBy("mBlockedAppUids")
private final HashSet<Integer> mBlockedAppUids = new HashSet<>();
- // Note: if mDefaultRequest is changed, NetworkMonitor needs to be updated.
@NonNull
private final NetworkRequest mDefaultRequest;
// The NetworkAgentInfo currently satisfying the default request, if any.