Merge "Remove DISCONNECTING check from handleReportNetworkConnectivity"

2021-07-26 10:58:58 +00:00
parent 1975a57e83 58644b1f70
commit 9ad8acd76e
1 changed files with 0 additions and 2 deletions
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -5083,10 +5083,8 @@ public class ConnectivityService extends IConnectivityManager.Stub

    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;
        }