diff --git a/device/rockchip/rk3288/rk3288_box/init.rc b/device/rockchip/rk3288/rk3288_box/init.rc
index c9f82df39f..84a0777686 100644
--- a/device/rockchip/rk3288/rk3288_box/init.rc
+++ b/device/rockchip/rk3288/rk3288_box/init.rc
@@ -422,6 +422,16 @@ on boot
 
     class_start core
 
+on property:netadb.status=true
+    setprop service.adb.tcp.port 5555
+    stop adbd
+    start adbd
+
+on property:netadb.status=false
+    setprop service.adb.tcp.port 0
+    stop adbd
+    start adbd
+
 on nonencrypted
     class_start main
     class_start late_start
diff --git a/packages/apps/Settings/AndroidManifest.xml b/packages/apps/Settings/AndroidManifest.xml
index 9e6246bffa..dff451fd34 100755
--- a/packages/apps/Settings/AndroidManifest.xml
+++ b/packages/apps/Settings/AndroidManifest.xml
@@ -2261,6 +2261,14 @@
                <category android:name="android.intent.category.DEFAULT" />        
             </intent-filter>
             
+        </receiver>
+         <receiver android:name=".NetAdbBootStatus"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+               <category android:name="android.intent.category.DEFAULT" />        
+            </intent-filter>
+            
         </receiver>
         <receiver android:name="ScheduleOnOffReceiver" android:process=":remote">
             <intent-filter>
diff --git a/packages/apps/Settings/res/values-zh-rCN/strings.xml b/packages/apps/Settings/res/values-zh-rCN/strings.xml
index 9c6e4f26a0..2122bb7354 100755
--- a/packages/apps/Settings/res/values-zh-rCN/strings.xml
+++ b/packages/apps/Settings/res/values-zh-rCN/strings.xml
@@ -1442,6 +1442,7 @@
     <string name="bugreport_in_power_summary" msgid="1778455732762984579">"在电源菜单中显示用于提交错误报告的按钮"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"不锁定屏幕"</string>
     <string name="enable_log_save">启用日志保存</string>  
+    <string name="enable_net_adb">启用网络ADB</string>  
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充电时屏幕不会休眠"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"启用蓝牙 HCI 信息收集日志"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"捕获单个文件中的所有蓝牙 HCI 包"</string>
diff --git a/packages/apps/Settings/res/values/strings.xml b/packages/apps/Settings/res/values/strings.xml
index e365d8f38e..2b66830fc1 100755
--- a/packages/apps/Settings/res/values/strings.xml
+++ b/packages/apps/Settings/res/values/strings.xml
@@ -3409,6 +3409,7 @@
     <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
     <string name="keep_screen_on">Stay awake</string>
     <string name="enable_log_save">Enable logging to save</string>
+    <string name="enable_net_adb">Enable Net ADB</string>
     <!-- setting Checkbox summary whether to keep the screen on when plugged in  -->
     <string name="keep_screen_on_summary">Screen will never sleep while charging</string>
     <!-- Setting Checkbox title whether to enable bluetooth HCI snoop log -->
diff --git a/packages/apps/Settings/res/xml/development_prefs.xml b/packages/apps/Settings/res/xml/development_prefs.xml
index e5191b5165..990e7773b3 100644
--- a/packages/apps/Settings/res/xml/development_prefs.xml
+++ b/packages/apps/Settings/res/xml/development_prefs.xml
@@ -36,6 +36,11 @@
         android:title="@string/enable_log_save" 
         />
 
+     <SwitchPreference
+        android:key="enable_net_adb" 
+        android:title="@string/enable_net_adb" 
+        />
+
     <SwitchPreference
         android:key="keep_screen_on"
         android:title="@string/keep_screen_on"
diff --git a/packages/apps/Settings/src/com/android/settings/DevelopmentSettings.java b/packages/apps/Settings/src/com/android/settings/DevelopmentSettings.java
index e91b04fbf5..66f95b7b87 100644
--- a/packages/apps/Settings/src/com/android/settings/DevelopmentSettings.java
+++ b/packages/apps/Settings/src/com/android/settings/DevelopmentSettings.java
@@ -95,6 +95,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
     private static final String ENABLE_TERMINAL = "enable_terminal";
     private static final String KEEP_SCREEN_ON = "keep_screen_on";
     private static final String ENABLE_LOG_SAVE = "enable_log_save";
+    private static final String ENABLE_NET_ADB = "enable_net_adb";
     private static final String BT_HCI_SNOOP_LOG = "bt_hci_snoop_log";
     private static final String ENABLE_OEM_UNLOCK = "oem_unlock_enable";
     private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
@@ -191,6 +192,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
     private SwitchPreference mBugreportInPower;
     private SwitchPreference mKeepScreenOn;
     private SwitchPreference mEnableLogSave;
+    private SwitchPreference mEnableNetAdb;
     private SwitchPreference mBtHciSnoopLog;
     private SwitchPreference mEnableOemUnlock;
     private SwitchPreference mAllowMockLocation;
@@ -308,6 +310,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         mBugreportInPower = findAndInitSwitchPref(BUGREPORT_IN_POWER_KEY);
         mKeepScreenOn = findAndInitSwitchPref(KEEP_SCREEN_ON);
         mEnableLogSave = findAndInitSwitchPref(ENABLE_LOG_SAVE);
+        mEnableNetAdb = findAndInitSwitchPref(ENABLE_NET_ADB);
         mBtHciSnoopLog = findAndInitSwitchPref(BT_HCI_SNOOP_LOG);
         mEnableOemUnlock = findAndInitSwitchPref(ENABLE_OEM_UNLOCK);
         if (!showEnableOemUnlockPreference()) {
@@ -1432,7 +1435,15 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
              }else{
                 SystemProperties.set("app.logsave.start","0");
              }
-        } else if (preference == mBtHciSnoopLog) {
+        } else if(preference == mEnableNetAdb)
+        {            
+             if(mEnableNetAdb.isChecked())
+             {
+                SystemProperties.set("netadb.status","true");
+             }else{
+                SystemProperties.set("netadb.status","false");
+             }
+        }else if (preference == mBtHciSnoopLog) {
             writeBtHciSnoopLogOptions();
         } else if (preference == mEnableOemUnlock) {
             if (!showKeyguardConfirmation(getResources(), REQUEST_CODE_ENABLE_OEM_UNLOCK)) {
diff --git a/packages/apps/Settings/src/com/android/settings/NetAdbBootStatus.java b/packages/apps/Settings/src/com/android/settings/NetAdbBootStatus.java
new file mode 100644
index 0000000000..49a19bc8e0
--- /dev/null
+++ b/packages/apps/Settings/src/com/android/settings/NetAdbBootStatus.java
@@ -0,0 +1,27 @@
+package com.android.settings;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.SystemClock;
+import android.util.Log;
+import android.os.SystemProperties;
+
+public class NetAdbBootStatus extends BroadcastReceiver{
+
+       @Override
+       public void onReceive(Context arg0, Intent arg1) {
+               // TODO Auto-generated method stub
+               
+               String action = arg1.getAction();
+               if(action.equals(Intent.ACTION_BOOT_COMPLETED))
+               { 
+               SharedPreferences shared = arg0.getSharedPreferences("com.android.settings_preferences", Context.MODE_PRIVATE);
+               boolean enable_net_adb = shared.getBoolean("enable_net_adb", false);
+               if(enable_net_adb)
+                       SystemProperties.set("app.logsave.start", "true");
+               }
+       }
+
+}
diff --git a/vendor/rockchip/common/phone/lib/libreference-ril.so b/vendor/rockchip/common/phone/lib/libreference-ril.so
index 4aeb5367aa..2af0c338cf 100644
Binary files a/vendor/rockchip/common/phone/lib/libreference-ril.so and b/vendor/rockchip/common/phone/lib/libreference-ril.so differ