android9.0添加以太网接口

frameworks/opt/net/ethernet/java/com/android/server/ethernet/EthernetTracker.java

diff --git a/core/java/android/net/EthernetManager.java b/core/java/android/net/EthernetManager.java
old mode 100644
new mode 100755
index ecccda588ae..39e54920abc
--- a/core/java/android/net/EthernetManager.java
+++ b/core/java/android/net/EthernetManager.java
@@ -123,6 +123,7 @@ public class EthernetManager {
         }
     }
 
+       
     /*
      * Adds a listener.
      * @param listener A {@link Listener} to add. 
      */
@@ -171,4 +172,18 @@ public class EthernetManager {
             }
         }
     }
+       
+               
+               /**
+       state
+       true 开启以太网
+       false 关闭以太网
+    **/
+    public boolean setInterfaceStatus(String iface, boolean state){
+               try {
+            return mService.setInterfaceStatus(iface,state);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }  
 }
diff --git a/core/java/android/net/IEthernetManager.aidl b/core/java/android/net/IEthernetManager.aidl
old mode 100644
new mode 100755
index 94960b51d32..08b5f055ab6
--- a/core/java/android/net/IEthernetManager.aidl
+++ b/core/java/android/net/IEthernetManager.aidl
@@ -32,4 +32,5 @@ interface IEthernetManager
     boolean isAvailable(String iface);
     void addListener(in IEthernetServiceListener listener);
     void removeListener(in IEthernetServiceListener listener);
+    boolean setInterfaceStatus(String iface, boolean state);
 }
diff --git a/java/com/android/server/ethernet/EthernetServiceImpl.java b/java/com/android/server/ethernet/EthernetServiceImpl.java
old mode 100644
new mode 100755
index d5beec1..5bb7b0d
--- a/java/com/android/server/ethernet/EthernetServiceImpl.java
+++ b/java/com/android/server/ethernet/EthernetServiceImpl.java
@@ -126,6 +126,19 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
         // TODO: this does not check proxy settings, gateways, etc.
         // Fix this by making IpConfiguration a complete representation of static configuration.
         mTracker.updateIpConfiguration(iface, new IpConfiguration(config));
+               
+        if (mTracker.isRestrictedInterface(iface)) {
+            enforceUseRestrictedNetworksPermission();
+        }   
+ 
+        // TODO: this does not check proxy settings, gateways, etc.
+        // Fix this by making IpConfiguration a complete representation of static configuration.
+     
+        mTracker.updateIpConfiguration(iface, new IpConfiguration(config));
+        mTracker.removeInterface(iface);//清除当前端口
+        mTracker.start();
+
     }
 
@@ -142,6 +155,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
         return mTracker.isTrackingInterface(iface);
     }
 
+
     /**
      * Adds a listener.
      * @param listener A {@link IEthernetServiceListener} to add.
      */
@@ -187,4 +201,16 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
         mHandler.dump(new PrintWriterPrinter(pw), "EthernetServiceImpl");
         pw.decreaseIndent();
     }
+       /**
+       * state
+       * true 开启以太网
+       * false 关闭以太网
+    **/
+
+    @Override
+    public boolean setInterfaceStatus(String iface, boolean state){
+         enforceAccessPermission();
+        return mTracker.setInterfaceStatus(iface,state);
+    }  
+       
 }
diff --git a/java/com/android/server/ethernet/EthernetTracker.java b/java/com/android/server/ethernet/EthernetTracker.java
old mode 100644
new mode 100755
index 00eedd5..720c2dd
--- a/java/com/android/server/ethernet/EthernetTracker.java
+++ b/java/com/android/server/ethernet/EthernetTracker.java
@@ -167,7 +167,7 @@ final class EthernetTracker {
         mListeners.unregister(listener);
     }
 
-    private void removeInterface(String iface) {
+    public void removeInterface(String iface) {
         mFactory.removeInterface(iface);
     }
 
@@ -427,4 +427,28 @@ final class EthernetTracker {
             mFactory.dump(fd, pw, args);
         });
     }
+	
+	/**
+	state
+	true 开启以太网
+	false 关闭以太网
+    **/
+    public boolean setInterfaceStatus(String iface, boolean state){
+         try {
+            if(!TextUtils.isEmpty(iface)) {
+                if(!state)
+                    mNMService.setInterfaceDown(iface);
+                else 
+                    mNMService.setInterfaceUp(iface);
+                return true;
+            } else {
+                Log.e(TAG,"iface is null");
+            }   
+        } catch (Exception e) {
+            Log.e(TAG, "Error setInterfaceStatus : " + iface + " state : " + state + " exception : " + e); 
+        }   
+        return false;
+    }  
+
+
 }