Yabin Cui
0ff8590e78
resolved conflicts for merge of bff40697
to mnc-dr-dev-plus-aosp
...
Change-Id: I7d7a614a5eb987ef6aecd32ed15a6eaa43e93957
2015-07-24 13:58:03 -07:00
Yabin Cui
bff406978a
am addf7a96
: Merge "init: Let property_get return std::string."
...
* commit 'addf7a964b5b17c00e5e371e2d0ed42eb5e563e1':
init: Let property_get return std::string.
2015-07-24 18:26:51 +00:00
Yabin Cui
addf7a964b
Merge "init: Let property_get return std::string."
2015-07-24 18:16:06 +00:00
Yabin Cui
74edcea90e
init: Let property_get return std::string.
...
Bug: 22654233
Change-Id: Id6091f58432f75e966b9871256049fbe17766c10
2015-07-24 11:14:08 -07:00
Elliott Hughes
470df782f4
am 1f76c1ab
: am 9727a6a0
: Merge "Report getaddrinfo failures correctly."
...
* commit '1f76c1abea3196a61f85164a078d44505d3a6b5e':
Report getaddrinfo failures correctly.
2015-07-24 17:42:55 +00:00
Elliott Hughes
1f76c1abea
am 9727a6a0
: Merge "Report getaddrinfo failures correctly."
...
* commit '9727a6a01942551af248563535196e6d722eb186':
Report getaddrinfo failures correctly.
2015-07-24 17:27:47 +00:00
Elliott Hughes
9727a6a019
Merge "Report getaddrinfo failures correctly."
2015-07-24 17:18:47 +00:00
Elliott Hughes
381cfa9a8b
Report getaddrinfo failures correctly.
...
Also move us off the "convenience" function because you can't get useful
error reporting from it.
Change-Id: I5fcc6a6d762f5f60906980a7835f01a35045be65
2015-07-23 21:14:38 -07:00
Elliott Hughes
646732eb94
am f5defe75
: am 89cc750e
: Merge "Don\'t limit Windows USB reads."
...
* commit 'f5defe752334c557a6be2d7242c944a81f11be76':
Don't limit Windows USB reads.
2015-07-23 19:10:09 +00:00
Elliott Hughes
819f022181
am 2fc8a91e
: am 6b40d0aa
: Merge "adb: win32: fix exec-in and exec-out to use binary mode"
...
* commit '2fc8a91eb35556b6f2bb4018b0fe2c08de55fe1c':
adb: win32: fix exec-in and exec-out to use binary mode
2015-07-23 19:10:07 +00:00
Elliott Hughes
335321e7c1
am d804c6cd
: am 571c8d71
: Merge "Increase size of the the adb packets sent over the wire"
...
* commit 'd804c6cdc5f0dd4bccfe802f3e4db12e9110e0ef':
Increase size of the the adb packets sent over the wire
2015-07-23 19:10:05 +00:00
Elliott Hughes
f5defe7523
am 89cc750e
: Merge "Don\'t limit Windows USB reads."
...
* commit '89cc750e9b2623aae3c257ce6c72f4ffe3e1bb33':
Don't limit Windows USB reads.
2015-07-23 18:28:39 +00:00
Elliott Hughes
2fc8a91eb3
am 6b40d0aa
: Merge "adb: win32: fix exec-in and exec-out to use binary mode"
...
* commit '6b40d0aaa1e8142dbe14a1fb1bfd7ff04de54e53':
adb: win32: fix exec-in and exec-out to use binary mode
2015-07-23 18:28:37 +00:00
Elliott Hughes
d804c6cdc5
am 571c8d71
: Merge "Increase size of the the adb packets sent over the wire"
...
* commit '571c8d713c43d418f722ee71105457b8e76adc20':
Increase size of the the adb packets sent over the wire
2015-07-23 18:28:35 +00:00
Elliott Hughes
89cc750e9b
Merge "Don't limit Windows USB reads."
2015-07-22 23:48:08 +00:00
Elliott Hughes
61ee830ec9
Don't limit Windows USB reads.
...
In 3d2904cdf2
we removed the code that broke
Linux USB reads into 4KiB chunks. This patch does the same for Windows. This
improves Windows "adb pull" speeds 6x in my VM. (There was no equivalent
problem with writes, so this change only affects pull speeds.)
Change-Id: If19013e5f51975f4824bf9147b7b76cebd305b96
2015-07-22 15:59:06 -07:00
Elliott Hughes
6b40d0aaa1
Merge "adb: win32: fix exec-in and exec-out to use binary mode"
2015-07-22 22:43:45 +00:00
Elliott Hughes
571c8d713c
Merge "Increase size of the the adb packets sent over the wire"
2015-07-22 22:42:05 +00:00
Tamas Berghammer
3d2904cdf2
Increase size of the the adb packets sent over the wire
...
The reason behing this change is to increase the adb push/pull speed
with reduceing the number of packets sent between the host and the
device because the communication is heavily bound by packet latency.
The change maintains two way compatibility in the communication
protocol with negotiating a packet size between the target and the
host with the CONNECT packets.
After this change the push/pull speeds improved significantly
(measured from Linux-x86_64 with 100MB of data):
| Old push | Old pull || New push | New pull |
-----------------------------------------------------------
Hammerhead | 4.6 MB/s | 3.9 MB/s || 13.1 MB/s | 16.5 MB/s |
-----------------------------------------------------------
Volantis | 6.0 MB/s | 6.2 MS/s || 25.9 MB/s | 29.0 MB/s |
-----------------------------------------------------------
Fugu | 6.0 MB/s | 5.1 MB/s || 27.9 MB/s | 33.2 MB/s |
-----------------------------------------------------------
Change-Id: Id9625de31266e43394289e325c7e7e473379c5d8
2015-07-22 13:06:06 -07:00
Elliott Hughes
2694ad9ad9
am 7f12fa27
: am f5b46079
: Merge "init: use init\'s property expansion code for mount_all"
...
* commit '7f12fa275604504ed874c08d6b7f906e8e522c73':
init: use init's property expansion code for mount_all
2015-07-22 18:05:02 +00:00
Elliott Hughes
7f12fa2756
am f5b46079
: Merge "init: use init\'s property expansion code for mount_all"
...
* commit 'f5b46079621801ced3c24e37507e58299953c814':
init: use init's property expansion code for mount_all
2015-07-22 17:50:48 +00:00
Elliott Hughes
f5b4607962
Merge "init: use init's property expansion code for mount_all"
2015-07-22 17:38:55 +00:00
Nan Liu
12df1e118a
init: use init's property expansion code for mount_all
...
Change-Id: I3bd00c74cd126b66927eca7812943f8427009356
Signed-off-by: Nan Liu <nan.liu619@gmail.com>
2015-07-22 10:36:49 -07:00
Mark Salyzyn
5e0231adba
am deee35d7
: am 3f1d7ebb
: Merge "logd: refine is_prio"
...
* commit 'deee35d76fe5bc7abd060f66105512401237cbd8':
logd: refine is_prio
2015-07-22 17:30:41 +00:00
Mark Salyzyn
deee35d76f
am 3f1d7ebb
: Merge "logd: refine is_prio"
...
* commit '3f1d7ebbc81fad6eea14811bbf31acb41ca38499':
logd: refine is_prio
2015-07-22 17:16:42 +00:00
Mark Salyzyn
3f1d7ebbc8
Merge "logd: refine is_prio"
2015-07-22 17:04:44 +00:00
Mark Salyzyn
618d0dec50
logd: refine is_prio
...
- Heuristics associated with translation of kernel messages to
Android user space logs.
- Limit is_prio to 4 characters, we got false positives on hex
values like <register contents> with no alpha chars.
- x11 and other register definitions are not valid tags, en0 is
- fix some Android coding standard issues
Change-Id: Idc3dcc53a2cb75ac38628c8ef7a5d5b53f12587a
2015-07-22 07:36:03 -07:00
Elliott Hughes
b0250ce713
am 32b4d786
: am a5d0ca4f
: Merge "Show "(reverse)" in "adb reverse --list"."
...
* commit '32b4d786e14dd14cee39c12f56231ccf56c6710a':
Show "(reverse)" in "adb reverse --list".
2015-07-22 00:54:03 +00:00
Elliott Hughes
32b4d786e1
am a5d0ca4f
: Merge "Show "(reverse)" in "adb reverse --list"."
...
* commit 'a5d0ca4f16a7e51726affb226975b57e495391e4':
Show "(reverse)" in "adb reverse --list".
2015-07-22 00:41:03 +00:00
Mark Salyzyn
02cb8dc57b
am 7b0bb824
: am 93adb524
: Merge "init: Fix logging stutter"
...
* commit '7b0bb82447af0c025ba769d2003f3b1514b9ec25':
init: Fix logging stutter
2015-07-22 00:25:52 +00:00
Mark Salyzyn
021485e566
am 18fc744f
: am 6743dab5
: Merge "init: Add additional logging levels"
...
* commit '18fc744f2ed22d772ca6f1ed69f69eecd9bf86a7':
init: Add additional logging levels
2015-07-22 00:25:51 +00:00
Elliott Hughes
a5d0ca4f16
Merge "Show "(reverse)" in "adb reverse --list"."
2015-07-22 00:25:41 +00:00
Mark Salyzyn
7b0bb82447
am 93adb524
: Merge "init: Fix logging stutter"
...
* commit '93adb524bc5a95f5f432daf3fa983d5bea107b7e':
init: Fix logging stutter
2015-07-22 00:12:48 +00:00
Mark Salyzyn
18fc744f2e
am 6743dab5
: Merge "init: Add additional logging levels"
...
* commit '6743dab51fbd6487ab924ad38e5d4c07dd174a60':
init: Add additional logging levels
2015-07-22 00:12:47 +00:00
Elliott Hughes
34c20bbdff
Show "(reverse)" in "adb reverse --list".
...
Bug: http://b/17788586
Change-Id: I250a1459295ed38e8d962da8bea2a8d2f83c7ef0
2015-07-21 17:09:06 -07:00
Mark Salyzyn
93adb524bc
Merge "init: Fix logging stutter"
2015-07-22 00:01:17 +00:00
Mark Salyzyn
6743dab51f
Merge "init: Add additional logging levels"
2015-07-22 00:01:10 +00:00
Elliott Hughes
86da352c43
am d66e949b
: am 2e7c39ec
: Merge ""adb tcpip" should require a numeric argument."
...
* commit 'd66e949b14305b367d3de4ba00901bff1122bb0e':
"adb tcpip" should require a numeric argument.
2015-07-21 23:50:12 +00:00
Elliott Hughes
d66e949b14
am 2e7c39ec
: Merge ""adb tcpip" should require a numeric argument."
...
* commit '2e7c39ecf7489540ad23e52cbe8bce94b0e26eca':
"adb tcpip" should require a numeric argument.
2015-07-21 23:37:57 +00:00
Mark Salyzyn
636b1ebd38
init: Fix logging stutter
...
- Get rid of log stutter, tag (executable basename) is added by
the logging routines
Bug: 17914575
Change-Id: If00eb1b915065fb52c9311648b7ada4c9e2696bd
2015-07-21 16:32:20 -07:00
Mark Salyzyn
692abc2b5f
init: Add additional logging levels
...
- Add WARNING, DEBUG and VERBOSE levels
Bug: 17914575
Change-Id: Ia5ba03c164ea38fad4ab30356491741afc987116
2015-07-21 16:32:10 -07:00
Elliott Hughes
2e7c39ecf7
Merge ""adb tcpip" should require a numeric argument."
2015-07-21 23:28:39 +00:00
Elliott Hughes
19d80b878c
"adb tcpip" should require a numeric argument.
...
Defaulting to port 0 just breaks stuff.
Bug: http://b/22636927
Change-Id: I6239900e0828e71b31171d0184c24824957c99c8
2015-07-21 16:27:46 -07:00
Elliott Hughes
433ff5887a
am 59ae3947
: am 3bcdaa28
: Merge "Recognize IPv6 addresses for "adb connect"."
...
* commit '59ae39473d1d9a53ecfbeb802f2b91c8e00a33e6':
Recognize IPv6 addresses for "adb connect".
2015-07-21 22:50:42 +00:00
Elliott Hughes
59ae39473d
am 3bcdaa28
: Merge "Recognize IPv6 addresses for "adb connect"."
...
* commit '3bcdaa287760c8b1821c581493bfe851169ec65f':
Recognize IPv6 addresses for "adb connect".
2015-07-21 22:37:36 +00:00
Elliott Hughes
3bcdaa2877
Merge "Recognize IPv6 addresses for "adb connect"."
2015-07-21 22:29:05 +00:00
Elliott Hughes
3d5f60dbba
Recognize IPv6 addresses for "adb connect".
...
Bug: http://b/22559299
Change-Id: I32891d706b5010c38db84a056e76dd279b780f75
2015-07-21 15:25:14 -07:00
Riley Andrews
7c1ae0051d
am e850f578
: Disable scaling of the cfs tunables.
...
* commit 'e850f5786cdd4d3e4f1157db8785de3e6ff77eab':
Disable scaling of the cfs tunables.
2015-07-21 21:15:37 +00:00
Riley Andrews
e850f5786c
Disable scaling of the cfs tunables.
...
The cfs tunables auto-scale with the number of active cpus by default. Given
that the tunable settings are in device-independent code and it's not
known how many cores are currently active when the init.rc file runs,
the cfs tunables can vary pretty significantly across devices depending
on the state at boot. Disable scaling of the the tunables so that we
can get more consistent behavior of cfs across devices. If we want to
do per-device tuning of these values, we can override what's written
here in device specific files.
Bug: 22634118
Change-Id: Id19b24ef819fef762521e75af55e6d4378cfc949
2015-07-21 19:49:45 +00:00
Elliott Hughes
36bb59cda8
am 3cd33a72
: am 5208d551
: Merge "adb: logging: newlines, thread ids, error code overwriting"
...
* commit '3cd33a722543a6da22c6dd70b700d27e7890e2b7':
adb: logging: newlines, thread ids, error code overwriting
2015-07-21 18:28:47 +00:00