rk3288 android6 网络共存实现
实现网络共存，添加如下补丁
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 327fb8a..e5bcb04 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -166,9 +166,17 @@ public class ConnectivityService extends IConnectivityManager.Stub
private static final String TAG = "ConnectivityService";
private static final boolean DBG = true;
private static final boolean VDBG = false;
private static final boolean LOGD_RULES = false;
+ private static final boolean LOGD_BLOCKED_NETWORKINFO = true;
+
+ // if true:
+ // wifi and ethernet can coexist, if wifi and ethernet connect together, prefered to use ethernet
+ // if false:
+ // wifi and ethernet can't coexist, if wifi and ethernet connect together, will tear down wifi
+ // TODO: still have bug in this case to fix (like can't reconnect wifi when ethernet disconnect)
+ private static final boolean ENABLE_NETWORK_COEXIST = true;
// TODO: create better separation between radio types and network types
@@ -4247,7 +4255,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
loge("Dead network still had at least " + nr);
break;
}
- nai.asyncChannel.disconnect();
+
+ if (ENABLE_NETWORK_COEXIST) {
+ log("Skip teardownUnneededNetwork: " + nai.name());
+ } else {
+ nai.asyncChannel.disconnect();
+ }
}
private void handleLingerComplete(NetworkAgentInfo oldNetwork) {
===============================================================================================================================
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 020495f..3e4794b 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -4805,6 +4805,15 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (ENABLE_NETWORK_COEXIST) {
log("Skip teardownUnneededNetwork: " + nai.name());
+ if (nai.getCurrentScore() > 0) {
+ try {
+ mNetd.removeInterfaceFromNetwork(nai.linkProperties.getInterfaceName(), nai.network.netId);
+ mNetd.addInterfaceToLocalNetwork(nai.linkProperties.getInterfaceName(), nai.linkProperties.getRoutes());
+ mLegacyTypeTracker.add(nai.networkInfo.getType(), nai);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed to add iface to local network " + e);
+ }
+ }
} else {
nai.asyncChannel.disconnect();
}
@@ -4953,6 +4962,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
} else {
if (VDBG) log(" accepting network in place of null");
}
+ if (ENABLE_NETWORK_COEXIST) {
+ try {
+ mNetd.removeInterfaceFromLocalNetwork(newNetwork.linkProperties.getInterfaceName());
+ } catch(RemoteException e) {}
+ updateLinkProperties(newNetwork,null);
+ }
newNetwork.unlingerRequest(nri.request);
mNetworkForRequestId.put(nri.request.requestId, newNetwork);
if (!newNetwork.addRequest(nri.request)) {
@@ -5297,6 +5312,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
// This has to happen after matching the requests, because callbacks are just requests.
notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_PRECHECK);
} else if (state == NetworkInfo.State.DISCONNECTED) {
+ if (ENABLE_NETWORK_COEXIST) {
+ try {
+ mNetd.removeInterfaceFromLocalNetwork(networkAgent.linkProperties.getInterfaceName());
+ } catch(RemoteException e) {}
+ }
networkAgent.asyncChannel.disconnect();
if (networkAgent.isVPN()) {
synchronized (mProxyLock) {
若需要wifi访问外网，以太网用于访问局域网，则打如下补丁：
fzk@RD-DEP1-SERVER-163:~/rk3288_rel_5.1/frameworks/opt/net/ethernet$ git diff
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java
index e5cb6f9..8abc5ea 100644
--- a/java/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -81,7 +81,7 @@ import java.lang.Exception;
class EthernetNetworkFactory {
private static final String NETWORK_TYPE = "Ethernet";
private static final String TAG = "EthernetNetworkFactory";
- private static final int NETWORK_SCORE = 150;
+ private static final int NETWORK_SCORE = 30;
private static final boolean DBG = true;
private static final boolean VDBG = false;共存且wifi优先级高时，若断开wifi后，设置界面以太网也显示未连接，或者先连接wifi后，再连接以太网时，以太网连接失败，则用下面补丁
fzk@RD-DEP1-SERVER-163:~/rk3288_rel_5.1/frameworks/opt/net/ethernet$ git diff
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java
index e80b252..974fa0f 100755
--- a/java/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -411,6 +411,9 @@ class EthernetNetworkFactory {
// TODO: Handle DHCP renew.
Thread dhcpThread = new Thread(new Runnable() {
public void run() {
+ if (mEthernetCurrentState == EthernetManager.ETHER_STATE_CONNECTED){ //注意Android6.0可能是EthernetManager.ETHERNET_CONNECT_STATE_CONNECT
+ return ;
+ }
if (DBG) Log.i(TAG, "dhcpThread(+" + mIface + "): mNetworkInfo=" + mNetworkInfo);
LinkProperties linkProperties;
================================================================================================================
7.0如下：
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java
index 15fe2e2..729070a 100755
--- a/java/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -408,6 +446,10 @@ class EthernetNetworkFactory {
if (carrier != 1) {
return;
}
+
+ if (mEthernetCurrentState == EthernetManager.ETHER_STATE_CONNECTED){
+ return ;
+ }
synchronized(EthernetNetworkFactory.this) {
if (mIpProvisioningThread != null) {
/rk3288_rel_5.1/frameworks/base$ git diff
diff --git a/core/java/android/net/NetworkFactory.java b/core/java/android/net/NetworkFactory.java
index 64d0fcf..c4ae1a3 100644
--- a/core/java/android/net/NetworkFactory.java
+++ b/core/java/android/net/NetworkFactory.java
@@ -220,7 +220,7 @@ public class NetworkFactory extends Handler {
private void evalRequest(NetworkRequestInfo n) {
if (VDBG) log("evalRequest");
- if (n.requested == false && n.score < mScore &&
+ if (n.requested == false && 0 < mScore &&
n.request.networkCapabilities.satisfiedByNetworkCapabilities(
mCapabilityFilter) && acceptRequest(n.request, n.score)) {
if (VDBG) log(" needNetworkFor");遇到问题：以太网和4G移动数据能够共存，以太网访问内网，4G访问外网（）
以太网和4G 网络都能够UP ，且以太网ping内网能够ping通，4G 网络ping 外网的IP也能ping通，但是4G网络通过浏览器无法访问外网，把以太网开关关闭，4G就能够通过浏览器访问外网
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
mNetworkAgent = new DcNetworkAgent(getHandler().getLooper(), mPhone.getContext(),
"DcNetworkAgent", mNetworkInfo, makeNetworkCapabilities(), mLinkProperties,
50, misc);将4g提高到50，比以太网70高点 。