Commit graph

16161 commits

Author SHA1 Message Date
Elliott Hughes
3fe6de1c39 Merge "Add a simple test for using non-ASCII paths with adb." 2015-07-24 23:07:56 +00:00
Elliott Hughes
614e0a47d3 Add a simple test for using non-ASCII paths with adb.
Bug: https://code.google.com/p/android/issues/detail?id=8185
Change-Id: If28a0ff345f44b60d6651bb36afb0bf72fe55e16
2015-07-24 15:26:46 -07:00
Elliott Hughes
6281dbcd11 am 7d86f5e5: am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)."
* commit '7d86f5e527c01d3fda84575af98888ee117159ee':
  Fix Win32 adb build (for the second time today).
2015-07-24 22:04:19 +00:00
Yabin Cui
00ede7d262 init: do expand_props before calling the builtins.
Also switch expand_props to std::string.

Bug: 22654233

Change-Id: I62910d4f74e2b1a5bd2b14aea440767a2a8462b7
2015-07-24 15:02:19 -07:00
Elliott Hughes
7d86f5e527 am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)."
* commit '239f6ac8e73e294eaf21ec70a9f2f7a3631ab964':
  Fix Win32 adb build (for the second time today).
2015-07-24 21:47:49 +00:00
Elliott Hughes
239f6ac8e7 Merge "Fix Win32 adb build (for the second time today)." 2015-07-24 21:34:17 +00:00
Elliott Hughes
4f1d7b55d7 Fix Win32 adb build (for the second time today).
Change-Id: I83cb407660cd8b5ed65a80574875fe261e8a8926
2015-07-24 14:32:46 -07:00
Elliott Hughes
c53ef014e5 am f077e45c: am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp."
* commit 'f077e45cc47d1bf16779f3a689bd0cd857cb7f03':
  Clean up the locking in usb_linux.cpp.
2015-07-24 21:11:11 +00:00
Elliott Hughes
0ddd9b2143 am 51d08e8e: am 2e942a47: Merge "Fix Win32 adb build."
* commit '51d08e8e7abe50051650b1ea5936006c6d6da3e9':
  Fix Win32 adb build.
2015-07-24 21:10:48 +00:00
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
Elliott Hughes
f077e45cc4 am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp."
* commit '9dad4ec4408bf412c265ac9bb27c84bb5098e67c':
  Clean up the locking in usb_linux.cpp.
2015-07-24 20:37:12 +00:00
Elliott Hughes
9dad4ec440 Merge "Clean up the locking in usb_linux.cpp." 2015-07-24 20:21:53 +00:00
Elliott Hughes
812f030477 Clean up the locking in usb_linux.cpp.
tsan complained that usb_bulk_write accesses usb_handle members outside
a lock. Fix that, but by moving everything over to C++11 locking.

Note that the old code was checking whether pthread_cond_timedwait returned
a negative value, which it will never do --- it will signal timeout (or
any other error) by returning a positive errno value. The rewrite does
what they appeared to intend to do (break out on timeout), rather than
what they actually did (keep trying forever).

Bug: http://b/22598587
Change-Id: Iab6869ffed4874143a7da97193d6b09e34cf2933
2015-07-24 12:35:50 -07:00
Elliott Hughes
51d08e8e7a am 2e942a47: Merge "Fix Win32 adb build."
* commit '2e942a47967ad302db15b3f7f17cf17f28785d16':
  Fix Win32 adb build.
2015-07-24 18:50:30 +00:00
Elliott Hughes
2e942a4796 Merge "Fix Win32 adb build." 2015-07-24 18:36:56 +00:00
Elliott Hughes
d48dbd89c8 Fix Win32 adb build.
Change-Id: I0a07379c470b7fa7f9bdef68c17ccb7bd0bd2079
2015-07-24 11:35:40 -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
Jeff Vander Stoep
3f62a020c4 logd: allow logd to write to /dev/cpuset files
Required by logd on devices with USE_CPUSETS defined.

Make /dev/cpuset/background, /dev/cpuset/foreground and
/dev/cpuset/task writeable by system gid. Add logd to system
group for writing to cpuset files and to root group to avoid
regressions. When dropping privs, also drop supplementary groups.

Bug: 22699101
Change-Id: Icc01769b18b5e1f1649623da8325a8bfabc3a3f0
2015-07-24 16:22:06 +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
Bertrand SIMONNET
c95440e9b6 metrics: Import protobufs from Chromium.
Instead of pulling the protobufs from chromium, copy them into
platform2/metrics/proto.
This enables us to add Chromium OS specific changes without polluting
Chromium's protobuf.

BUG=chrome-os-partner:42861
TEST=`FEATURES=test emerge-gizmo metrics` succeeds.

CQ-DEPEND=CL:286895

Change-Id: Ib919a21da6518199c29adb70c8bc27220e0dc031
Reviewed-on: https://chromium-review.googlesource.com/286943
Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>
Trybot-Ready: Bertrand Simonnet <bsimonnet@chromium.org>
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>
2015-07-23 01:16:46 +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