android4.4增加ethernet

妖狐艹你老母 2022-07-27 16:31 218阅读 0赞

增加ethernet主要是三部分：１、ethernet service; 2、ethernet Settings  3、Systemui ethernet通知

以下提到的源文件将会在文章最后提供下载地址

拷贝frameworks/base/ethernet到frameworks/base下

修改frameworks/base/Android.mk

在  
    wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \\  
下加上如下代码

ethernet/java/android/net/ethernet/IEthernetManager.aidl \

修改build/core/pathmap.mk在  
FRAMEWORKS\_BASE\_SUBDIRS中加上ethernet

拷贝EthernetService.java到frameworks/base/services/java/com/android/server/下

修改frameworks/base/core/java/android/content/Context.java  
在  
    public static final String WIFI\_P2P\_SERVICE = "wifip2p";  
下加上如下内容

/**
         * Use with {@link #getSystemService} to retrieve a {@link
         * android.net.ethernet.EthernetManager} for handling management of
         * Ethernet access.
         *
         * @see #getSystemService
         * @see android.net.ethernet.EthernetManager
         */
        public static final String ETH_SERVICE = "ethernet";//add by hclydao

修改frameworks/base/core/java/android/app/ContextImpl.java  
在  
import android.net.wifi.p2p.IWifiP2pManager;  
import android.net.wifi.p2p.WifiP2pManager;  
下增加如下内容

import android.net.ethernet.IEthernetManager;
    import android.net.ethernet.EthernetManager;

在

registerService(WIFI\_P2P\_SERVICE, new ServiceFetcher() \{  
                public Object createService(ContextImpl ctx) \{  
                    IBinder b = ServiceManager.getService(WIFI\_P2P\_SERVICE);  
                    IWifiP2pManager service = IWifiP2pManager.Stub.asInterface(b);  
                    return new WifiP2pManager(service);  
                \}\});  
  
下增加如下内容

registerService(ETH_SERVICE, new ServiceFetcher() {
                    public Object createService(ContextImpl ctx) {
                        IBinder b = ServiceManager.getService(ETH_SERVICE);
                        IEthernetManager service = IEthernetManager.Stub.asInterface(b);
                        return new EthernetManager(service, ctx.mMainThread.getHandler());
                    }}); //add by hclydao

修改frameworks/base/services/java/com/android/server/ConnectivityService.java  
增加

import android.net.ethernet.EthernetManager;//add by hclydao
    import android.net.ethernet.EthernetStateTracker;

注释掉  
//import android.net.EthernetDataTracker;  
在  
            try \{  
                tracker = netFactory.createTracker(targetNetworkType, config);  
                mNetTrackers\[targetNetworkType\] = tracker;  
            \} catch (IllegalArgumentException e) \{  
                Slog.e(TAG, "Problem creating " + getNetworkTypeName(targetNetworkType)  
                        + " tracker: " + e);  
                continue;  
            \}

下加上如下代码  
  
            if(mNetConfigs\[targetNetworkType\].radio == ConnectivityManager.TYPE\_ETHERNET) \{ //add by hclydao  
                EthernetService ethernet = new EthernetService(context, (EthernetStateTracker)mNetTrackers\[targetNetworkType\]);  
                ServiceManager.addService(Context.ETH\_SERVICE, ethernet);  
                mNetTrackers\[targetNetworkType\].startMonitoring(context, mTrackerHandler);  
            \}

注释掉  
                    //return EthernetDataTracker.getInstance();

增加如下代码

return new EthernetStateTracker(targetNetworkType, config.name);//add by hclydao

拷贝android\_net\_ethernet.cpp到frameworks/base/core/jni目录下  
修改frameworks/base/core/jni下的Android.mk  
在  
    android\_net\_wifi\_WifiNative.cpp \\  
下加上如下代码

android_net_ethernet.cpp \

修改frameworks/base/core/jni/AndroidRuntime.cpp  
在  
extern int register\_android\_net\_wifi\_WifiNative(JNIEnv\* env);下  
加上

extern int register\_android\_net\_ethernet\_EthernetManager(JNIEnv\* env);//add by hclydao

在  
REG\_JNI(register\_android\_net\_wifi\_WifiNative),  
下加上如下代码

REG_JNI(register_android_net_ethernet_EthernetManager),

在framework/base/core/java/android/provider/Settings.java中  
       public static final String WIFI\_ON = "wifi\_on";  
下加上如下代码

public static final String ETH_ON      = "eth_on";
             public static final String ETH_MODE    = "eth_mode";
             public static final String ETH_IP      = "eth_ip";
             public static final String ETH_MASK    = "eth_mask";
             public static final String ETH_DNS     = "eth_dns";
             public static final String ETH_ROUTE   = "eth_route";
             public static final String ETH_CONF    = "eth_conf";
             public static final String ETH_IFNAME  = "eth_ifname";

Settings部分修改

拷贝eth\_configure.xml到Settings/res/layout/  
拷贝ic\_setttings\_ethernet.png到Settings/res/drawable-hdpi与drawable-mdpi  
拷贝ethernet\_settings.xml到Settings/res/xml下  
修改xml下settings\_headers.xml在wifi下增加如下内容

<header
            android:id="@+id/ethernet_settings"
            android:title="@string/eth_setting"
            android:icon="@drawable/ic_settings_ethernet"
            android:fragment="com.android.settings.ethernet.EthernetSettings"/>

修改values/strings.xml增加如下内容

<string name="eth_config_title">Configure Ethernet device</string>
        <string name="eth_setting">Ethernet</string>
        <string name="eth_dev_list">Ethernet Devices:</string>
        <string name="eth_con_type">Connection Type</string>
        <string name="eth_con_type_dhcp">DHCP</string>
        <string name="eth_con_type_manual">Static IP</string>
        <string name="eth_dns">DNS address</string>
        <string name="eth_gw">Gateway address</string>
        <string name="eth_ipaddr">IP address</string>
        <string name="eth_quick_toggle_title">Ethernet</string>
        <string name="eth_quick_toggle_summary">Turn on Ethernet</string>
        <string name="eth_conf_perf_title">Ethernet configuration</string>
        <string name="eth_conf_summary">Configure Ethernet devices</string>
        <string name="eth_mask">Netmask</string>
        <string name="eth_toggle_summary_off">Turn off Ethernet</string>
        <string name="eth_toggle_summary_on">Turn on Ethernet</string>
        <string name="eth_settings_error">Failed to set: Please enter the valid characters 0~255</string>

拷贝Settings/src/ethernet到Settings/src文件夹下

修改Settings/AndroidManifest.xml  
在  
          
  
        <activity android:name="Settings$WirelessSettingsActivity"  
                android:taskAffinity="com.android.settings"  
                android:label="@string/wireless\_networks\_settings\_title"  
                android:parentActivityName="Settings">  
            <intent-filter>  
                <action android:name="android.intent.action.MAIN" />  
                <action android:name="android.settings.WIRELESS\_SETTINGS" />  
                <action android:name="android.settings.AIRPLANE\_MODE\_SETTINGS" />  
                <action android:name="android.settings.NFC\_SETTINGS" />  
                <category android:name="android.intent.category.DEFAULT" />  
                <category android:name="android.intent.category.VOICE\_LAUNCH" />  
            </intent-filter>  
            <meta-data android:name="com.android.settings.FRAGMENT\_CLASS"  
                android:value="com.android.settings.WirelessSettings" />  
            <meta-data android:name="com.android.settings.TOP\_LEVEL\_HEADER\_ID"  
                android:resource="@id/wireless\_settings" />  
        </activity>

下增加如下代码

<activity android:name="Settings$EthernetSettingsActivity"
                    android:label="@string/eth_setting">
                <intent-filter>
                    <action android:name="android.intent.action.MAIN" />
                    <action android:name="android.settings.ETHERNET_SETTINGS" />
                    <category android:name="android.intent.category.DEFAULT" />
                    <category android:name="android.intent.category.VOICE_LAUNCH" />
                    <category android:name="com.android.settings.SHORTCUT" />
                </intent-filter>
                <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                    android:value="com.android.settings.ethernet.EthernetSettings" />
                <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                    android:resource="@id/ethernet_settings" />
            </activity>

修改Settings/src/Utils.java  
在  
    public static String getWifiIpAddresses(Context context) \{  
        ConnectivityManager cm = (ConnectivityManager)  
                context.getSystemService(Context.CONNECTIVITY\_SERVICE);  
        LinkProperties prop = cm.getLinkProperties(ConnectivityManager.TYPE\_WIFI);  
        return formatIpAddresses(prop);  
    \}  
下增加如下代码

public static String getEtherProperties(Context context) {
            ConnectivityManager cm = (ConnectivityManager)
                    context.getSystemService(Context.CONNECTIVITY_SERVICE);
            LinkProperties prop = cm.getLinkProperties(ConnectivityManager.TYPE_ETHERNET);
            return prop.toString();
        }

修改Settings/src/Settings.java  
加上

import com.android.settings.ethernet.EthernetSettings;

在  
            R.id.wifi\_settings,  
下加上

R.id.ethernet_settings,

在  
        WifiSettings.class.getName(),  
下加上

EthernetSettings.class.getName(),

SystemUI修改

拷贝systemui下所有.png文件到frameworks/base/packages/SystemUI/res/drawable下  
修改frameworks/base/packages/SystemUI/res/values/strings.xml  
在  
    <string name="accessibility\_no\_sim">No SIM.</string>  
下增加如下

<string name="accessibility_ethernet_connected">Ethernet connected.</string>
        <string name="accessibility_ethernet_disconnected">Ethernet disconnected.</string>
        <string name="accessibility_ethernet_connecting">Ethernet connecting.</string>

修改frameworks/base/packages/SystemUI/res/layout/signal\_cluster\_view.xml  
在  
    <View  
        android:layout\_height="6dp"  
        android:layout\_width="6dp"  
        android:visibility="gone"  
        android:id="@+id/spacer"  
        />  
    <!--<FrameLayout  
        android:id="@+id/wimax\_combo"  
        android:layout\_height="wrap\_content"  
        android:layout\_width="wrap\_content"  
        android:layout\_marginEnd="-6dp"  
        >  
上增加

修改frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java  
在  
    private int mWifiStrengthId = 0;  
下增加

private boolean mEthernetVisible = false;
        private int mEthernetStateId = 0;

在private String mWifiDescription, mMobileDescription, mMobileTypeDescription,mEthernetDescription;  
后增加,mEthernetDescription如上

然后增加mEthernetGroup,mEthernet如下

ViewGroup mWifiGroup, mMobileGroup,mEthernetGroup;  
    ImageView mWifi, mMobile, mWifiActivity, mMobileActivity, mMobileType, mAirplane,mEthernet;

在  
    @Override  
    public void setIsAirplaneMode(boolean is, int airplaneIconId) \{  
        mIsAirplaneMode = is;  
        mAirplaneIconId = airplaneIconId;  
  
        apply();  
    \}  
下增加

@Override
        public void setEthernetIndicators(boolean visible, int stateIcon, int activityIcon,
                String contentDescription) {
            mEthernetVisible = visible;
            mEthernetStateId = stateIcon;
            //mEthernetActivityId = activityIcon;
            mEthernetDescription = contentDescription;
    
            apply();
        }

在  
mAirplane       = (ImageView) findViewById(R.id.airplane);  
下增加

mEthernetGroup  = (ViewGroup) findViewById(R.id.ethernet_combo);
            mEthernet       = (ImageView) findViewById(R.id.ethernet_state);

在mAirplane       = null;  
下增加

mEthernetGroup  = null;
            mEthernet	    = null;

在  
        if (mIsAirplaneMode) \{  
            mAirplane.setImageResource(mAirplaneIconId);  
            mAirplane.setVisibility(View.VISIBLE);  
        \} else \{  
            mAirplane.setVisibility(View.GONE);  
        \}  
下增加

if (mEthernetVisible) {
                mEthernetGroup.setVisibility(View.VISIBLE);
                mEthernet.setImageResource(mEthernetStateId);
                //mEthernetActivity.setImageResource(mEthernetActivityId);
                mEthernetGroup.setContentDescription(mEthernetDescription);
            } else {
                mEthernetGroup.setVisibility(View.GONE);
            }

然后增加mEthernetVisible如下

if (mMobileVisible && mWifiVisible && mIsAirplaneMode && mEthernetVisible) \{

修改frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java  
增加

import android.net.ethernet.EthernetManager;
    import android.net.ethernet.EthernetStateTracker;
    import android.util.Slog;
    import com.android.systemui.R;

在  
    String mContentDescriptionWimax;  
下增加

String mContentDescriptionEthernet;//add by hclydao

在  
    //wimax  
    private boolean mWimaxSupported = false;  
    private boolean mIsWimaxEnabled = false;  
    private boolean mWimaxConnected = false;  
    private boolean mWimaxIdle = false;  
    private int mWimaxIconId = 0;  
    private int mWimaxSignal = 0;  
    private int mWimaxState = 0;  
    private int mWimaxExtraState = 0;  
下增加

// Ethernet
        boolean mShowEthIcon, mEthernetWaitingDHCP;
        boolean mEthernetPhyConnect=false ;
        int mEthernetIconId = 0;

在  
    String mLastCombinedLabel = "";  
下增加

int mLastEthernetIconId = -1;

在  
        void setIsAirplaneMode(boolean is, int airplaneIcon);  
下增加

void setEthernetIndicators(boolean visible, int stateIcon, int activityIcon,
                    String contentDescription);

在  
        filter.addAction(Intent.ACTION\_AIRPLANE\_MODE\_CHANGED);  
下增加

filter.addAction(EthernetManager.ETH_STATE_CHANGED_ACTION);

在  
cluster.setIsAirplaneMode(mAirplaneMode, mAirplaneIconId);  
上增加如

cluster.setEthernetIndicators(
                    mShowEthIcon,
                    mEthernetIconId,
                    -1,
                    mContentDescriptionEthernet);

在  
    else if (action.equals(WimaxManagerConstants.NET\_4G\_STATE\_CHANGED\_ACTION) ||  
                    action.equals(WimaxManagerConstants.SIGNAL\_LEVEL\_CHANGED\_ACTION) ||  
                    action.equals(WimaxManagerConstants.WIMAX\_NETWORK\_STATE\_CHANGED\_ACTION)) \{  
                updateWimaxState(intent);  
                refreshViews();  
            \}  
下增加

else if (action.equals(EthernetManager.ETH_STATE_CHANGED_ACTION)) {
                updateEth(intent);
                refreshViews();
            }

在  
    updateWimaxIcons函数下增加函数

// ===== Ethernet ===================================================================
        private final void updateEth(Intent intent) {
            final int event = intent.getIntExtra(EthernetManager.EXTRA_ETH_STATE, EthernetStateTracker.EVENT_HW_DISCONNECTED);
            Slog.d(TAG, "updateEth event=" + event);
            switch (event) {
                case EthernetStateTracker.EVENT_HW_CONNECTED:
                    if (mEthernetWaitingDHCP)
                        return;
                    // else fallthrough
                case EthernetStateTracker.EVENT_INTERFACE_CONFIGURATION_SUCCEEDED: {
                        mEthernetWaitingDHCP = false;
                    EthernetManager ethManager = (EthernetManager) mContext.getSystemService(mContext.ETH_SERVICE);
                    if (ethManager.isEthDeviceAdded()) {
                        mShowEthIcon = true;
                        mEthernetIconId =R.drawable.ethernet_connected ; //  sEthImages[0]; 
                        mContentDescriptionEthernet = mContext.getString(R.string.accessibility_ethernet_connected);
                    }
                    return;
                }
                case EthernetStateTracker.EVENT_INTERFACE_CONFIGURATION_FAILED:
                    mEthernetWaitingDHCP = false;
    				//if(!mEthernetPhyConnect)
                     // return ;
                    mShowEthIcon = true;
                    mEthernetIconId = R.drawable.ethernet_disconnected; // sEthImages[1]; 
                    mContentDescriptionEthernet = mContext.getString(R.string.accessibility_ethernet_disconnected);
                    return;
                case EthernetStateTracker.EVENT_DHCP_START:
                    mEthernetWaitingDHCP = true ;
                    return;
                case EthernetStateTracker.EVENT_HW_PHYCONNECTED:
                    mEthernetPhyConnect = true ;
                    mShowEthIcon = true;
                    mEthernetIconId =R.drawable.ethernet_connecting ; // sEthImages[2]; // 2
                    mContentDescriptionEthernet = mContext.getString(R.string.accessibility_ethernet_connecting);
                    return;
                case EthernetStateTracker.EVENT_HW_PHYDISCONNECTED:
                    mEthernetPhyConnect = false ;
                    mEthernetWaitingDHCP = false;
                    mShowEthIcon = false;
                    mEthernetIconId = -1;
                    mContentDescriptionEthernet = null;
                    return;
                case EthernetStateTracker.EVENT_HW_DISCONNECTED:
                    mEthernetPhyConnect = false ;
                    mEthernetWaitingDHCP = false;
                    mShowEthIcon = false;
                    mEthernetIconId = -1;
                    mContentDescriptionEthernet = null;
                    return ;
                case EthernetStateTracker.EVENT_HW_CHANGED:
                    return;            
                
                default:
                    if (mEthernetWaitingDHCP)
                        return;
                    mShowEthIcon = false;
                    mEthernetIconId = -1;
                    mContentDescriptionEthernet = null;
                    return;
            }
        }

在  
        if (mBluetoothTethered) \{  
            combinedLabel = mContext.getString(R.string.bluetooth\_tethered);  
            combinedSignalIconId = mBluetoothTetherIconId;  
            mContentDescriptionCombinedSignal = mContext.getString(  
                    R.string.accessibility\_bluetooth\_tether);  
        \}  
下增加

if (mShowEthIcon) {
                wifiLabel = mContentDescriptionEthernet;
                combinedSignalIconId = mEthernetIconId;
                mContentDescriptionCombinedSignal = mContentDescriptionEthernet;
            }

在这个下面增加

final boolean ethernetConnected = (mConnectedNetworkType == ConnectivityManager.TYPE_ETHERNET);
            if (ethernetConnected) {
                // TODO: icons and strings for Ethernet connectivity
                combinedLabel = mConnectedNetworkTypeName;
            }

注释掉之前的　  
/\*  
        final boolean ethernetConnected = (mConnectedNetworkType == ConnectivityManager.TYPE\_ETHERNET);  
        if (ethernetConnected) \{  
            combinedLabel = context.getString(R.string.ethernet\_label);  
        \}  
\*///modify by hclydao  
在&& !ethernetConnected后增加 && !mShowEthIcon  
在         || mLastWifiIconId                 != mWifiIconId  
下增加  
         || mLastEthernetIconId             != mEthernetIconId

在  
        // the wimax icon on phones  
        if (mLastWimaxIconId != mWimaxIconId) \{  
            mLastWimaxIconId = mWimaxIconId;  
        \}  
下增加

// ethernet icon on phones
            if (mLastEthernetIconId != mEthernetIconId) {
                mLastEthernetIconId = mEthernetIconId;
                // Phone UI not supported yet.
            }

基本上就修改这些地方

先执行下make update-api在编译

碰到的问题

设置静态ＩＰ无法启动问题

解决方法

修改frameworks/base/services/java/com/android/server/ConnectivityService.java部分代码为：

if(mNetConfigs[targetNetworkType].radio == ConnectivityManager.TYPE_ETHERNET) { //add by hclydao
            EthernetService ethernet = new EthernetService(context, (EthernetStateTracker)mNetTrackers[targetNetworkType]);
            ServiceManager.addService(Context.ETH_SERVICE, ethernet);
           // mNetTrackers[targetNetworkType].startMonitoring(context, mTrackerHandler);
    	}

以及

if(mClat != null) //add by hclydao
    		if (mClat.requiresClat(netType, tracker)) {
    
    			// If the connection was previously using clat, but is not using it now, stop the clat
    			// daemon. Normally, this happens automatically when the connection disconnects, but if
    			// the disconnect is not reported, or if the connection's LinkProperties changed for
    			// some other reason (e.g., handoff changes the IP addresses on the link), it would
    			// still be running. If it's not running, then stopping it is a no-op.
    			if (Nat464Xlat.isRunningClat(curLp) && !Nat464Xlat.isRunningClat(newLp)) {
    			    mClat.stopClat();
    			}
    			// If the link requires clat to be running, then start the daemon now.
    			if (mNetTrackers[netType].getNetworkInfo().isConnected()) {
    			    mClat.startClat(tracker);
    			} else {
    			    mClat.stopClat();
    			}
    		}

============================================  
作者：hclydao  
[http://blog.csdn.net/hclydao][http_blog.csdn.net_hclydao]  
版权没有，但是转载请保留此段声明

============================================

相关源码下载地址:[http://download.csdn.net/detail/hclydao/9472079][http_download.csdn.net_detail_hclydao_9472079]

有积分的麻烦用积分下载，没积分的想办法给点积分,然后去github下载吧

github里有记录一些bug的更新，文章上就不修改了

CSDN升级排版就不仔细改了

地址: [https://github.com/hcly/android4.4-ethernet][https_github.com_hcly_android4.4-ethernet]

文件为zip文件，上传自动加了\_下载后请删除最后的\_

[http_blog.csdn.net_hclydao]: http://blog.csdn.net/hclydao
[http_download.csdn.net_detail_hclydao_9472079]: http://download.csdn.net/detail/hclydao/9472079
[https_github.com_hcly_android4.4-ethernet]: https://github.com/hcly/android4.4-ethernet