From c1c8f5b34c703cec116401eb0415f47708055d8b Mon Sep 17 00:00:00 2001
From: rpdzkj <rpdzkj>
Date: Wed, 3 Aug 2022 16:47:25 +0800
Subject: [PATCH] add multi network connect

---
 .../common/device/android/net/NetworkFactoryLegacyImpl.java  | 5 +++--
 .../service/src/com/android/server/ConnectivityService.java  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frameworks/libs/net/common/device/android/net/NetworkFactoryLegacyImpl.java b/frameworks/libs/net/common/device/android/net/NetworkFactoryLegacyImpl.java
index 6dd0adb0c95..5f198c8e7ec 100644
--- a/frameworks/libs/net/common/device/android/net/NetworkFactoryLegacyImpl.java
+++ b/frameworks/libs/net/common/device/android/net/NetworkFactoryLegacyImpl.java
@@ -286,8 +286,9 @@ class NetworkFactoryLegacyImpl extends Handler
             n.requested = true;
         } else if (shouldReleaseNetworkFor(n)) {
             if (VDBG) mParent.log("  releaseNetworkFor");
-            mParent.releaseNetworkFor(n.request);
-            n.requested = false;
+// remove by rpdzkj for support multi network            
+//            mParent.releaseNetworkFor(n.request);
+//            n.requested = false;
         } else {
             if (VDBG) mParent.log("  done");
         }
diff --git a/packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java b/packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
index 418e9e33b8d..58d83365171 100644
--- a/packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+++ b/packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
@@ -7789,7 +7789,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
                 break;
             }
         }
-        nai.disconnect();
+//        nai.disconnect(); //remove by rpdzkj for usb the same netmask
     }
 
     private void handleLingerComplete(NetworkAgentInfo oldNetwork) {
-- 
2.25.1