am 6aaa0bc2: am 0c9bb058: Merge "Add config settings for ethernet/wifi tcp buffers" into lmp-dev

* commit '6aaa0bc22b2bd8d6fac750dd4a46322d66804d61':
  Add config settings for ethernet/wifi tcp buffers
This commit is contained in:
Robert Greenwalt
2014-08-22 21:45:35 +00:00
committed by Android Git Automerger
2 changed files with 10 additions and 0 deletions

View File

@@ -1378,6 +1378,14 @@
<string-array name="config_mobile_tcp_buffers">
</string-array>
<!-- Configure ethernet tcp buffersizes in the form:
rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->
<string name="config_ethernet_tcp_buffers" translatable="false">524288,1048576,3145728,524288,1048576,2097152</string>
<!-- Configure wifi tcp buffersizes in the form:
rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->
<string name="config_wifi_tcp_buffers" translatable="false">524288,1048576,2097152,262144,524288,1048576</string>
<!-- Whether WiFi display is supported by this device.
There are many prerequisites for this feature to work correctly.
Here are a few of them:

View File

@@ -990,6 +990,8 @@
<java-symbol type="string" name="ssl_ca_cert_warning" />
<java-symbol type="string" name="lockscreen_transport_play_description" />
<java-symbol type="string" name="lockscreen_transport_pause_description" />
<java-symbol type="string" name="config_ethernet_tcp_buffers" />
<java-symbol type="string" name="config_wifi_tcp_buffers" />
<java-symbol type="plurals" name="abbrev_in_num_days" />
<java-symbol type="plurals" name="abbrev_in_num_hours" />