| Revisión | c1385b6825825e4ffff6ef835c2f13e2ee8e0606 (tree) |
|---|---|
| Tiempo | 2014-08-27 18:55:00 |
| Autor | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge tag 'android-4.4.4_r2' into kitkat-x86
Android 4.4.4 Release 2
adb/adb_client.c (diff) init/init.c (diff)
rootdir/init.rc (diff)| @@ -241,7 +241,7 @@ int adb_connect(const char *service) | ||
| 241 | 241 | } else { |
| 242 | 242 | // if server was running, check its version to make sure it is not out of date |
| 243 | 243 | char buf[100]; |
| 244 | - int n; | |
| 244 | + size_t n; | |
| 245 | 245 | int version = ADB_SERVER_VERSION - 1; |
| 246 | 246 | |
| 247 | 247 | // if we have a file descriptor, then parse version result |
| @@ -250,7 +250,7 @@ int adb_connect(const char *service) | ||
| 250 | 250 | |
| 251 | 251 | buf[4] = 0; |
| 252 | 252 | n = strtoul(buf, 0, 16); |
| 253 | - if(n > (int)sizeof(buf)) goto error; | |
| 253 | + if(n > sizeof(buf)) goto error; | |
| 254 | 254 | if(readx(fd, buf, n)) goto error; |
| 255 | 255 | adb_close(fd); |
| 256 | 256 |
| @@ -913,7 +913,6 @@ static int bootchart_init_action(int nargs, char **args) | ||
| 913 | 913 | #endif |
| 914 | 914 | |
| 915 | 915 | static const struct selinux_opt seopts_prop[] = { |
| 916 | - { SELABEL_OPT_PATH, "/data/security/property_contexts" }, | |
| 917 | 916 | { SELABEL_OPT_PATH, "/property_contexts" }, |
| 918 | 917 | { 0, NULL } |
| 919 | 918 | }; |
| @@ -136,6 +136,11 @@ loglevel 3 | ||
| 136 | 136 | # checker programs. |
| 137 | 137 | mkdir /dev/fscklogs 0770 root system |
| 138 | 138 | |
| 139 | +# pstore/ramoops previous console log | |
| 140 | + mount pstore pstore /sys/fs/pstore | |
| 141 | + chown system log /sys/fs/pstore/console-ramoops | |
| 142 | + chmod 0440 /sys/fs/pstore/console-ramoops | |
| 143 | + | |
| 139 | 144 | on post-fs |
| 140 | 145 | # once everything is setup, no need to modify / |
| 141 | 146 | mount rootfs rootfs / ro remount |
| @@ -364,6 +369,9 @@ on boot | ||
| 364 | 369 | setprop net.tcp.buffersize.gprs 4092,8760,11680,4096,8760,11680 |
| 365 | 370 | setprop net.tcp.buffersize.evdo 4094,87380,262144,4096,16384,262144 |
| 366 | 371 | |
| 372 | +# Define default initial receive window size in segments. | |
| 373 | + setprop net.tcp.default_init_rwnd 60 | |
| 374 | + | |
| 367 | 375 | class_start core |
| 368 | 376 | class_start main |
| 369 | 377 |
| @@ -396,9 +404,15 @@ on property:vold.decrypt=trigger_shutdown_framework | ||
| 396 | 404 | on property:sys.powerctl=* |
| 397 | 405 | powerctl ${sys.powerctl} |
| 398 | 406 | |
| 399 | -# system server cannot write to /proc/sys files, so proxy it through init | |
| 407 | +# system server cannot write to /proc/sys files, | |
| 408 | +# and chown/chmod does not work for /proc/sys/ entries. | |
| 409 | +# So proxy writes through init. | |
| 400 | 410 | on property:sys.sysctl.extra_free_kbytes=* |
| 401 | 411 | write /proc/sys/vm/extra_free_kbytes ${sys.sysctl.extra_free_kbytes} |
| 412 | +# "tcp_default_init_rwnd" Is too long! | |
| 413 | +on property:sys.sysctl.tcp_def_init_rwnd=* | |
| 414 | + write /proc/sys/net/ipv4/tcp_default_init_rwnd ${sys.sysctl.tcp_def_init_rwnd} | |
| 415 | + | |
| 402 | 416 | |
| 403 | 417 | ## Daemon processes to be run by init. |
| 404 | 418 | ## |
Android-x86
Fork