android4.4默认以太网优先参考

[email protected]:~/a33_4.4_v1.0_h33dv/android4.4/frameworks/base/packages/SettingsProvider$ git status .

# Not currently on any branch.

# Changes not staged for commit:

#   (use "git add <file>..." to update what will be committed)

#   (use "git checkout -- <file>..." to discard changes in working directory)

#

#       modified:   res/values/defaults.xml

#       modified:   src/com/android/providers/settings/DatabaseHelper.java

#

no changes added to commit (use "git add" and/or "git commit -a")

[email protected]:~/a33_4.4_v1.0_h33dv/android4.4/frameworks/base/packages/SettingsProvider$ git diff .

diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml

index 84ab0ff..8fa127a 100755

--- a/packages/SettingsProvider/res/values/defaults.xml

+++ b/packages/SettingsProvider/res/values/defaults.xml

@@ -17,6 +17,7 @@

  */

 -->

 <resources>

+       <integer name="def_network_preference">9</integer>

     <bool name="def_dim_screen">true</bool>

     <integer name="def_screen_off_timeout">60000</integer>

     <bool name="def_airplane_mode_on">false</bool>

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

index 171a93c..a416504 100755

--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

@@ -2209,6 +2209,8 @@ public class DatabaseHelper extends SQLiteOpenHelper {

             loadBooleanSetting(stmt, Settings.Global.ETHERNET_MODE,

                     R.bool.def_ethernet_mode);

+                       loadIntegerSetting(stmt, Settings.Global.NETWORK_PREFERENCE,

+                    R.integer.def_network_preference);

             // Enable or disable Cell Broadcast SMS

             loadSetting(stmt, Settings.Global.CDMA_CELL_BROADCAST_SMS,

[email protected]:~/a33_4.4_v1.0_h33dv/android4.4/device/softwinner/astar-y3/overlay$ git diff frameworks/base/core/res/res/values/config.xml

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml

index 4b80e22..082d23a 100755

--- a/overlay/frameworks/base/core/res/res/values/config.xml

+++ b/overlay/frameworks/base/core/res/res/values/config.xml

@@ -83,7 +83,7 @@

         <item>"mobile,0,0,0,-1,true"</item>

         <item>"mobile_bluetooth,7,7,1,-1,true"</item>

         <item>"bluetooth,7,7,1,60000,true"</item>

-        <item>"ethernet,9,9,2,-1,true"</item>

+        <item>"ethernet,9,9,4,-1,true"</item>

     </string-array>