| commit | ad07afc82411dd6431f7a909bd4f86652fe73d7e | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Mon Jul 26 11:11:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 26 11:11:30 2021 +0000 |
| tree | 809dccd57e2073a416de583db7287075af55bdf4 | |
| parent | 1e594fa4db7d67bddf615d9d1a27039daa35308d [diff] | |
| parent | 9ad8acd76e85dcc7474664302f0c03d5d4fd7719 [diff] |
Merge "Remove DISCONNECTING check from handleReportNetworkConnectivity" am: 9ad8acd76e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772439 Change-Id: I66569d993972c82400eb5583f182bedea9d75a54
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 6e38a3c..f8f280a 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java
@@ -5083,10 +5083,8 @@ private void handleReportNetworkConnectivity( @Nullable NetworkAgentInfo nai, int uid, boolean hasConnectivity) { - // TODO(b/192611346): remove NetworkInfo.State.DISCONNECTING as it's not used if (nai == null || nai != getNetworkAgentInfoForNetwork(nai.network) - || nai.networkInfo.getState() == NetworkInfo.State.DISCONNECTING || nai.networkInfo.getState() == NetworkInfo.State.DISCONNECTED) { return; }