Commit graph

61660 commits

Author SHA1 Message Date
Josh Gao
f2420d95a2 Merge changes Id8d9fa6c,I47d3ad50,I7cebbf75,Id10e320a am: a227c19ef2 am: 5954016965 am: da4b7221ff
Change-Id: I5241f9f636ca9fe6ce1cb846d0e5d46d427c3c0a
2020-05-12 06:12:28 +00:00
Josh Gao
da4b7221ff Merge changes Id8d9fa6c,I47d3ad50,I7cebbf75,Id10e320a am: a227c19ef2 am: 5954016965
Change-Id: If054be91a10b4bd9d3b736f3446d73289526b42d
2020-05-12 05:56:03 +00:00
Josh Gao
5954016965 Merge changes Id8d9fa6c,I47d3ad50,I7cebbf75,Id10e320a am: a227c19ef2
Change-Id: I9768dedeb7e2bd4f44c872bbaa6695a9fa8e794d
2020-05-12 05:44:01 +00:00
Josh Gao
a227c19ef2 Merge changes Id8d9fa6c,I47d3ad50,I7cebbf75,Id10e320a
* changes:
  adbd: avoid compiling more code in the daemon.
  adb: don't run all of the tests again over TCP in coverage.
  adbd: respect ADB_TRACE on host adbd.
  adb: mark kMaxProcessNameLength as constexpr.
2020-05-12 05:32:48 +00:00
Treehugger Robot
c91d52cec6 Merge changes I24e70952,I652560ad am: 8987016b1e am: e555230b01 am: 63b1e8650c
Change-Id: Ic1528bc1da8658a9ff2b8ed268aa3ccb107ded2b
2020-05-12 03:06:59 +00:00
Treehugger Robot
63b1e8650c Merge changes I24e70952,I652560ad am: 8987016b1e am: e555230b01
Change-Id: Id33adfef41b8efe35f2492b85eac4ff5e24acb69
2020-05-12 02:54:41 +00:00
Treehugger Robot
e555230b01 Merge changes I24e70952,I652560ad am: 8987016b1e
Change-Id: I8f5b9f40a41c9124dd14ac80178584a475330590
2020-05-12 02:37:27 +00:00
Automerger Merge Worker
fc1cc4ed5a Merge changes from topic "am-096409bf8d7c4205ac98667e05c41e29" into rvc-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev am: ce7d0ba607 am: b3b15d1738 -s ours
  [automerger skipped] libnetutils/packet.c - fix a raw socket reception race am: 74346aac9c am: e6877b7f16 -s ours
  [automerger skipped] libnetutils/packet.c - fix a socket leak on bind error am: b9add4a315 am: 991842c681 -s ours
2020-05-12 02:29:16 +00:00
Maciej Zenczykowski
3eea71c248 [automerger skipped] Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev am: ce7d0ba607 -s ours am: 271b004af8 -s ours
am skip reason: Change-Id I57cb2003dd75b0bc5528978fd131730273e37a43 with SHA-1 39c26d63cd is in history

Change-Id: I082fd2cda12920e0731dddde0b18abb18528371b
2020-05-12 02:29:06 +00:00
Maciej Zenczykowski
27ec7f877e [automerger skipped] Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev am: ce7d0ba607 am: b3b15d1738 -s ours
am skip reason: Change-Id I57cb2003dd75b0bc5528978fd131730273e37a43 with SHA-1 39c26d63cd is in history

Change-Id: I38ffa2be0e99d0af35d9102db17a3a256ca1baf7
2020-05-12 02:29:05 +00:00
Maciej Żenczykowski
c69951c079 [automerger skipped] libnetutils/packet.c - fix a raw socket reception race am: 74346aac9c am: e6877b7f16 -s ours
am skip reason: Change-Id I569d2b81a396f352ab5d1b71bd5ad0d96217aab1 with SHA-1 0129aaae86 is in history

Change-Id: I1a15c174a2dbd3b4611a57487d3e9fe5c0f28319
2020-05-12 02:29:02 +00:00
Maciej Żenczykowski
78db189ad4 [automerger skipped] libnetutils/packet.c - fix a socket leak on bind error am: b9add4a315 am: 991842c681 -s ours
am skip reason: Change-Id I01a10e36f852cde1b93a91f95b51294a434885ab with SHA-1 b7f370c014 is in history

Change-Id: I9b93b4d054a02efcd90a24775a53a6bf06cd5583
2020-05-12 02:29:00 +00:00
Treehugger Robot
8987016b1e Merge changes I24e70952,I652560ad
* changes:
  adb: use transport-id to make coverage script faster.
  adb: add `adb transport-id` command.
2020-05-12 02:22:27 +00:00
Maciej Zenczykowski
b3b15d1738 Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev am: ce7d0ba607
Change-Id: Ib9381a872980db7d506625e7645618e80f375290
2020-05-12 02:11:06 +00:00
Maciej Żenczykowski
e6877b7f16 libnetutils/packet.c - fix a raw socket reception race am: 74346aac9c
Change-Id: I9c57bf11896d4bb975a1f053dee9c23e61c013f2
2020-05-12 02:11:05 +00:00
Maciej Żenczykowski
991842c681 libnetutils/packet.c - fix a socket leak on bind error am: b9add4a315
Change-Id: I1612dd0cf96a48d64e10efea86f695563ee6cfe3
2020-05-12 02:11:02 +00:00
Maciej Zenczykowski
271b004af8 [automerger skipped] Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev am: ce7d0ba607 -s ours
am skip reason: Change-Id I57cb2003dd75b0bc5528978fd131730273e37a43 with SHA-1 39c26d63cd is in history

Change-Id: Ia5d3978086dff06d511e1d5b1511648fadbffda3
2020-05-12 02:10:20 +00:00
Maciej Zenczykowski
ce7d0ba607 Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev
* changes:
  libnetutils/packet.c - create socket with close-on-exec
  libnetutils/packet.c - fix a raw socket reception race
  libnetutils/packet.c - fix a socket leak on bind error
2020-05-12 01:57:56 +00:00
Tom Cherry
924e02cd90 Merge "logd: don't poll() before recvmsg()" am: bf3b47a031 am: de2a239467 am: b123c2e1c2
Change-Id: I92fc21c364467b71334b06d7512499e66666c877
2020-05-12 01:03:16 +00:00
TreeHugger Robot
7d691709a1 [automerger skipped] Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev am: 8601d37213 -s ours am: f7924aaa39 -s ours
am skip reason: Change-Id I1ec39744480e514ae7a7902643ed863e0ca0a340 with SHA-1 82035d6b82 is in history

Change-Id: I10111c3059a7b713fcf40ad4350f9226e7b1d299
2020-05-12 01:03:02 +00:00
Tom Cherry
b123c2e1c2 Merge "logd: don't poll() before recvmsg()" am: bf3b47a031 am: de2a239467
Change-Id: If2b27f90f9ec61d260b9da3fd03d4e2968e4e0d8
2020-05-12 01:02:54 +00:00
TreeHugger Robot
fd0ebbeee3 [automerger skipped] Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev am: 8601d37213 am: fca9e4c3b8 -s ours
am skip reason: Change-Id I1ec39744480e514ae7a7902643ed863e0ca0a340 with SHA-1 e6c1a84276 is in history

Change-Id: I40d94eaba7d2e96db31e8baa2cb3c00be9797d2b
2020-05-12 01:02:44 +00:00
TreeHugger Robot
fca9e4c3b8 Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev am: 8601d37213
Change-Id: I7e19e98c9ddece2cdccbf16eef72f0146cf2a537
2020-05-12 00:49:26 +00:00
Tom Cherry
de2a239467 Merge "logd: don't poll() before recvmsg()" am: bf3b47a031
Change-Id: I35b3a5e581163838d3154100c38719547a4fa7b2
2020-05-12 00:49:25 +00:00
TreeHugger Robot
f7924aaa39 [automerger skipped] Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev am: 8601d37213 -s ours
am skip reason: Change-Id I1ec39744480e514ae7a7902643ed863e0ca0a340 with SHA-1 e6c1a84276 is in history

Change-Id: I0b13a874776dde10f66f4fbb1cc95d1a8b428f26
2020-05-12 00:49:22 +00:00
Treehugger Robot
5a5f76ef04 Merge "Remove unneeded optimize_for lite" am: 1d77251d76 am: 15a669542e am: ff065c3de1
Change-Id: I114cc7ec110f3c27f5e2b50a17e5c766923268f2
2020-05-12 00:32:47 +00:00
TreeHugger Robot
8601d37213 Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev 2020-05-12 00:32:22 +00:00
Tom Cherry
bf3b47a031 Merge "logd: don't poll() before recvmsg()" 2020-05-12 00:31:37 +00:00
Treehugger Robot
ff065c3de1 Merge "Remove unneeded optimize_for lite" am: 1d77251d76 am: 15a669542e
Change-Id: If518a31d9063868179cb1138f960e7a2ccb5a998
2020-05-12 00:19:26 +00:00
TreeHugger Robot
99246db5e2 [automerger skipped] Merge "vts_processgroup_validate_test: make deps static" into rvc-dev am: f2caf7de6c -s ours am: 0c1bba27a9 -s ours
am skip reason: Change-Id I730526955a40ae00a97f487e423a00c743f75d53 with SHA-1 01840c53e8 is in history

Change-Id: Iaf91b5f7384d284d10d36bcbf05acd56f9cfd44c
2020-05-11 23:59:53 +00:00
TreeHugger Robot
99d1ba534d [automerger skipped] Merge "vts_processgroup_validate_test: make deps static" into rvc-dev am: f2caf7de6c am: 4e8680f440 -s ours
am skip reason: Change-Id I730526955a40ae00a97f487e423a00c743f75d53 with SHA-1 2572f23af8 is in history

Change-Id: I08dd033e96d0c30670dfd19f924d16c5501c4b42
2020-05-11 23:59:47 +00:00
Treehugger Robot
15a669542e Merge "Remove unneeded optimize_for lite" am: 1d77251d76
Change-Id: Ic831678603d567bba7c7b59954f268acb16f07e7
2020-05-11 23:59:43 +00:00
Treehugger Robot
1d77251d76 Merge "Remove unneeded optimize_for lite" 2020-05-11 23:49:29 +00:00
TreeHugger Robot
0c1bba27a9 [automerger skipped] Merge "vts_processgroup_validate_test: make deps static" into rvc-dev am: f2caf7de6c -s ours
am skip reason: Change-Id I730526955a40ae00a97f487e423a00c743f75d53 with SHA-1 2572f23af8 is in history

Change-Id: If3c257b6b5aa9844ae8b2d629aadf7d1026ceb95
2020-05-11 23:48:03 +00:00
TreeHugger Robot
4e8680f440 Merge "vts_processgroup_validate_test: make deps static" into rvc-dev am: f2caf7de6c
Change-Id: I0838b783f3de646e48bb0cfd5725245e4d408e0d
2020-05-11 23:47:53 +00:00
TreeHugger Robot
f2caf7de6c Merge "vts_processgroup_validate_test: make deps static" into rvc-dev 2020-05-11 23:33:28 +00:00
Maciej Żenczykowski
ecfb05d4ce libnetutils/packet.c - create socket with close-on-exec
This prevents fork/exec leaking sockets to child processes.

Test: builds, atest
Bug: 155297277
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I57cb2003dd75b0bc5528978fd131730273e37a43
Merged-In: I57cb2003dd75b0bc5528978fd131730273e37a43
2020-05-11 15:58:02 -07:00
Maciej Żenczykowski
74346aac9c libnetutils/packet.c - fix a raw socket reception race
A socket created bound to a specific protocol can receive packets before
it's bound to a specific interface/mac.

It's best to rely on the bind().

This replicates the way packet sockets are created in external/android-clat.
See: ring.c ring_create() and clatd.c configure_packet_socket()

Test: builds, atest
Bug: 155297277
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I569d2b81a396f352ab5d1b71bd5ad0d96217aab1
Merged-In: I569d2b81a396f352ab5d1b71bd5ad0d96217aab1
2020-05-11 15:57:53 -07:00
Maciej Żenczykowski
b9add4a315 libnetutils/packet.c - fix a socket leak on bind error
and clean up the code a little bit while at it.

Test: builds, atest
Bug: 155297277
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I01a10e36f852cde1b93a91f95b51294a434885ab
Merged-In: I01a10e36f852cde1b93a91f95b51294a434885ab
2020-05-11 15:57:44 -07:00
Yifan Hong
19dee5388b Merge "vts_processgroup_validate_test: make deps static" am: d6b307fb15 am: 1e6ff23b6e am: 9ca80b1989
Change-Id: Ifa6809a29faca8c97647bffcf4d4bb8d5c0ce821
2020-05-11 20:11:01 +00:00
Yifan Hong
9ca80b1989 Merge "vts_processgroup_validate_test: make deps static" am: d6b307fb15 am: 1e6ff23b6e
Change-Id: I36cb0d0a1363bb4777318dc6c07402537002392e
2020-05-11 19:52:36 +00:00
Yifan Hong
1e6ff23b6e Merge "vts_processgroup_validate_test: make deps static" am: d6b307fb15
Change-Id: Ibd82e15de71d3e94ca708e48b0c4fd1bf5f79ecc
2020-05-11 19:39:32 +00:00
Yifan Hong
01840c53e8 vts_processgroup_validate_test: make deps static
Test: pass
Fixes: 155959743
Change-Id: I730526955a40ae00a97f487e423a00c743f75d53
(cherry picked from commit 2572f23af8)
Merged-In: I730526955a40ae00a97f487e423a00c743f75d53
2020-05-11 12:32:26 -07:00
Ruchir Rastogi
6c35ad85e5 Merge "Use proper platform version checks (libstats)" into rvc-dev am: b797431342 am: 147a163fa0
Change-Id: I8042d6fddaa5bf491790430161f18b385978db40
2020-05-11 19:32:11 +00:00
Woody Lin
5443996d32 InitFatalReboot: Trigger panic explicitly for init_fatal_panic am: 8fb6e3fdaf am: d457f68d0a
Change-Id: I5a502ce573c4ebe6d6d4c8d3b76ad0d436c25885
2020-05-11 19:32:03 +00:00
Ruchir Rastogi
4c2fe4ccce Merge "Use proper platform version checks (libstats)" into rvc-dev am: b797431342 am: ea3a566de0
Change-Id: Ibf9e9d050cf056f7dce074a2377aaae40273ec13
2020-05-11 19:31:14 +00:00
Woody Lin
046d5be9f6 InitFatalReboot: Trigger panic explicitly for init_fatal_panic am: 8fb6e3fdaf am: 8c2716135b
Change-Id: I0e576a018ea7c29e7c5816ddeb0c99426cddac8a
2020-05-11 19:30:35 +00:00
Yifan Hong
d6b307fb15 Merge "vts_processgroup_validate_test: make deps static" 2020-05-11 19:29:39 +00:00
Ruchir Rastogi
ea3a566de0 Merge "Use proper platform version checks (libstats)" into rvc-dev am: b797431342
Change-Id: I403446a3981375a13085894d637d4d67c2c65197
2020-05-11 18:00:33 +00:00
Ruchir Rastogi
147a163fa0 Merge "Use proper platform version checks (libstats)" into rvc-dev am: b797431342
Change-Id: I7c501adef9f366e3bb412267fcb1dc30ba22e87a
2020-05-11 18:00:28 +00:00