Android11 工作中BUG处理，以太网静态IP设置问题

问题背景：
Android11，RK3568平台， 在连接了Ethernet手动设置IP信息，断电后拔掉网线，再次开机以太网未断连；断电重启后，已获取的ip偶发清空；以太网一直处于获取状态，无法成功加载ip。

解决方案：

1、开机检查是否插入网线，没插入网络不可用。

2、网络初始化后对已有的网络的重启。

修改代码

frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java

    @Override
    public void setEthernetIndicators(IconState state) {
        boolean visible = state.visible && !mBlockEthernet;
        int resId = state.icon;
        String description = state.contentDescription;
        //if (resId > 0) {
        //修改此处判断逻辑
        if (visible && resId > 0) {
            mIconController.setIcon(mSlotEthernet, resId, description);
            mIconController.setIconVisibility(mSlotEthernet, true);
        } else {
            mIconController.setIconVisibility(mSlotEthernet, false);
        }
    }

frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/policy/EthernetSignalController.java

    public void notifyListeners(SignalCallback callback) {
        boolean ethernetVisible = mCurrentState.connected;
        String contentDescription = getTextIfExists(getContentDescription()).toString();
        //判断网线未插入，以太网不可用,命令返回0=未插入，1=插入
        if(ethernetVisible){
            try{
                String cmdStr="cat /sys/class/net/eth0/carrier";
                ShellUtils.CommandResult  rs = ShellUtils.execCommand(cmdStr,false);
                if (rs.getSuccessMsg().indexOf("0") >= 0) {
                    ethernetVisible= false;
                }
            }catch(Exception e){
                    Log.e(TAG, "------notiyListeners()---erro---------" ,e);
            }
        }
        // TODO: wire up data transfer using WifiSignalPoller.
        callback.setEthernetIndicators(new IconState(ethernetVisible, getCurrentIconId(),
                contentDescription));

frameworks/base/packages/SystemUI/src/com/android/systemui/util/ShellUtils.java

package com.android.systemui.util;
import android.util.Log;

import java.io.BufferedReader;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.List;

/**
 * 控台命令工具
 */
public class ShellUtils {
    private static final String TAG = "ShellUtils";
    private static final String COMMAND_SU = "su"; // 获取root权限的命令
    private static final String COMMAND_SH = "sh"; // 执行sh文件的命令
    private static final String COMMAND_EXIT = "exit\n"; // 退出的命令
    private static final String COMMAND_LINE_END = "\n"; // 执行命令必须加在末尾

    private ShellUtils() {
        throw new AssertionError();
    }

    // 检测root状态
    public static boolean checkRootPermission() {
        return execCommand("echo root", true, false).result == 0;
    }

    // 执行单行命令,实际还是调用的执行多行 ,传入命令和是否需要root
    public static CommandResult execCommand(String command, boolean isRoot) {
        return execCommand(new String[] { command }, isRoot, true);
    }

    // 执行List<String>中的命令 , 传入List和是否需要root
    public static CommandResult execCommand(List<String> commands, boolean isRoot) {
        return execCommand(commands == null ? null : commands.toArray(new String[] {}), isRoot, true);
    }

    // 执行多行命令
    public static CommandResult execCommand(String[] commands, boolean isRoot) {
        return execCommand(commands, isRoot, true);
    }

    private static CommandResult execCommand(String command, boolean isRoot, boolean isNeedResultMsg) {
        return execCommand(new String[] { command }, isRoot, isNeedResultMsg);
    }

    public static CommandResult execCommand(List<String> commands, boolean isRoot, boolean isNeedResultMsg) {
        return execCommand(commands == null ? null : commands.toArray(new String[] {}), isRoot, isNeedResultMsg);
    }

    // 执行命令,获得返回的信息
    private static CommandResult execCommand(String[] commands, boolean isRoot, boolean isNeedResultMsg) {
        int result = -1;
        if (commands == null || commands.length == 0) {
            return new CommandResult(result, null, null);
        }

        Process process = null;
        BufferedReader successResult = null;
        BufferedReader errorResult = null;
        StringBuilder successMsg = null;
        StringBuilder errorMsg = null;
        DataOutputStream os = null;
        try {
            process = Runtime.getRuntime().exec(isRoot ? COMMAND_SU : COMMAND_SH);
            os = new DataOutputStream(process.getOutputStream());
            for (String command : commands) {
                if (command == null) {
                    continue;
                }
                os.write(command.getBytes());
                os.writeBytes(COMMAND_LINE_END);
                os.flush();
            }
            os.writeBytes(COMMAND_EXIT);
            os.flush();

            result = process.waitFor();
            // get command result
            if (isNeedResultMsg) {
                successMsg = new StringBuilder();
                errorMsg = new StringBuilder();
                successResult = new BufferedReader(new InputStreamReader(process.getInputStream()));
                errorResult = new BufferedReader(new InputStreamReader(process.getErrorStream()));
                String s;
                while ((s = successResult.readLine()) != null) {
                    successMsg.append(s + "\n");
                }
                while ((s = errorResult.readLine()) != null) {
                    errorMsg.append(s + "\n");
                }
            }
        } catch (Exception e) {
            Log.e(TAG, "--------execCommand Exception----------", e);
            e.printStackTrace();
        } finally {
            try {
                if (os != null) {
                    os.close();
                }
                if (successResult != null) {
                    successResult.close();
                }
                if (errorResult != null) {
                    errorResult.close();
                }
            } catch (IOException e) {
                e.printStackTrace();
            }

            if (process != null) {
                process.destroy();
            }
        }
        return new CommandResult(result, successMsg == null ? null : successMsg.toString(), errorMsg == null ? null
                : errorMsg.toString());
    }

    // 封装了返回信息
    public static class CommandResult {

        public final int result;
        public String successMsg; // 成功信息
        public String errorMsg; // 错误信息

        public CommandResult(int result) {
            this.result = result;
        }

        CommandResult(int result, String successMsg, String errorMsg) {
            this.result = result;
            this.successMsg = successMsg;
            this.errorMsg = errorMsg;
        }

        public String getSuccessMsg() {
            return successMsg;
        }

        public void setSuccessMsg(String successMsg) {
            this.successMsg = successMsg;
        }

        public int getResult() {
            return result;
        }

        @Override
        public String toString() {
            return "CommandResult{" +
                    "result=" + result +
                    ", successMsg='" + successMsg + '\'' +
                    ", errorMsg='" + errorMsg + '\'' +
                    '}';
        }
    }

}

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

        void onIpLayerStarted(LinkProperties linkProperties) {
            if (mNetworkAgent != null) {
                Log.e(TAG, "Already have a NetworkAgent - aborting new request");
                //stop();
                //重启原有网络，避免不好使
                restart();
                return;
            }
            mLinkProperties = linkProperties;

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

    void updateIpConfiguration(String iface, IpConfiguration ipConfiguration) {
        if (DBG) {
            Log.i(TAG, "updateIpConfiguration, iface: " + iface + ", cfg: " + ipConfiguration);
        }
        mIpConfigurations.put(iface, ipConfiguration);

        mHandler.post(() -> mFactory.updateIpConfiguration(iface, ipConfiguration));
        //增加了关闭和重新启动以太网接口，避免不好使
        updateInterfaceState(iface, false);
        updateInterfaceState(iface, true);
    }