| commit | 0fcf1cf17fb72aecc6a6e59349fdfd5aaa693378 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Mon Jul 26 11:21:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 26 11:21:48 2021 +0000 |
| tree | f32dce17d4ce6b5d73d6bbe91f546ebcf1c6ec3d | |
| parent | 0ce97e66c6693902669fc69f8687ab313f5d4efc [diff] | |
| parent | ad07afc82411dd6431f7a909bd4f86652fe73d7e [diff] |
Merge "Remove DISCONNECTING check from handleReportNetworkConnectivity" am: 9ad8acd76e am: ad07afc824 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772439 Change-Id: I7a33259e571db42018d3f346bef4c3f71c586a0c
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index a3b8b18..0173861 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java
@@ -5091,10 +5091,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; }