Commit graph

60647 commits

Author SHA1 Message Date
Treehugger Robot
dfbc5d3853 Merge "Add a few more trivial socket_spec.h tests." am: 53053dd1b1 am: 81c0b12c50
Change-Id: I9e87e70c8421f3cda7d432bd53f28893d28612ee
2020-05-13 01:27:55 +00:00
Treehugger Robot
81c0b12c50 Merge "Add a few more trivial socket_spec.h tests." am: 53053dd1b1
Change-Id: Ic8d57b15117cb6dee1085dc4a43b15f120cd5dd5
2020-05-13 01:15:19 +00:00
Treehugger Robot
53053dd1b1 Merge "Add a few more trivial socket_spec.h tests." 2020-05-13 01:00:39 +00:00
Elliott Hughes
e65e002102 Add a few more trivial socket_spec.h tests.
Also remove some dead code. The "missing port" case in
parse_tcp_socket_spec hasn't been meaningful since we put the default
port back.

Test: treehugger
Change-Id: I40958f0f1c2dd7f0315142c2c0363a70fe6f80fe
2020-05-12 16:38:11 -07:00
Treehugger Robot
f08e9935b0 Merge "liblog: remove useless #define" am: 18da289fac am: 0de918bdbb
Change-Id: I26a2df24e9b251602b5720afc07297de2af71746
2020-05-12 20:23:04 +00:00
Treehugger Robot
0de918bdbb Merge "liblog: remove useless #define" am: 18da289fac
Change-Id: I8d7953533e64deb50b26362917944c4ebcf45a0d
2020-05-12 20:09:22 +00:00
Treehugger Robot
6a1cde910c Merge "logd: remove unnecessary static" am: a597f75045 am: a55b2e3f68
Change-Id: Id8fc5c48e9ca3a0f12864a1196922e9bb36278de
2020-05-12 20:01:25 +00:00
Treehugger Robot
18da289fac Merge "liblog: remove useless #define" 2020-05-12 19:49:26 +00:00
Treehugger Robot
a55b2e3f68 Merge "logd: remove unnecessary static" am: a597f75045
Change-Id: I255b0a524af3c29f88c6de1891b51feb5fbdba12
2020-05-12 19:44:41 +00:00
Treehugger Robot
a597f75045 Merge "logd: remove unnecessary static" 2020-05-12 19:28:52 +00:00
Tom Cherry
6a391e9eda liblog: remove useless #define
Neither android_logger_free nor android_logger_close exist.

Test: build
Change-Id: Ieb4d740c234b54db9278a21f07b0533c28b76baf
2020-05-12 10:44:22 -07:00
Tom Cherry
40addf79d4 logd: remove unnecessary static
ThreadFunction() will only be entered once, so there's no worry that
we'll call prctl() multiple times.

Test: logging unit tests
Change-Id: Id2a02c2ab807f1565e3d625424e040481b3aa1a3
2020-05-12 10:42:25 -07:00
Christopher Ferris
bb530d4fbf Merge "Fix mac build." into rvc-dev am: 310b46c1ca
Change-Id: I120c57a6f54651392e540aa6d55791e68599bd7c
2020-05-12 17:39:40 +00:00
Christopher Ferris
9a3009ae8e [automerger skipped] Merge "Change call to mmap64." into rvc-dev am: 99dfe5ebba -s ours
am skip reason: Change-Id I7a6efbc0d4227403c3d08a08deea56f239382157 with SHA-1 7b9f35c9de is in history

Change-Id: I54b547fe6859a2b5da1affff8ae3362d94e5af96
2020-05-12 17:39:38 +00:00
Christopher Ferris
310b46c1ca Merge "Fix mac build." into rvc-dev 2020-05-12 17:17:25 +00:00
Christopher Ferris
99dfe5ebba Merge "Change call to mmap64." into rvc-dev 2020-05-12 17:17:25 +00:00
Tom Cherry
a0f8962885 Merge changes I9d6dde2c,I38bfcba5 am: a269c7c3d1 am: 0379e27671
Change-Id: I002718d30b31ddf29cccddb926da1fcb0cd9d01e
2020-05-12 16:21:19 +00:00
Tom Cherry
0379e27671 Merge changes I9d6dde2c,I38bfcba5 am: a269c7c3d1
Change-Id: I7b1d8555bab125ee5b0d2320917e16764c271537
2020-05-12 16:09:13 +00:00
Tom Cherry
a269c7c3d1 Merge changes I9d6dde2c,I38bfcba5
* changes:
  logd: separate LogStatistics from LogBuffer
  logd: remove LogFindWorst
2020-05-12 15:55:50 +00:00
TreeHugger Robot
aa1decbfdb [automerger skipped] Merge changes Idaa27ce2,I06644a72,I453c63fe into rvc-dev am: 7499783fd9 -s ours
am skip reason: Change-Id Idaa27ce24cc13d13145eaef85a08b9033922c7bc with SHA-1 4f55f3efd3 is in history

Change-Id: I4688e1fad465178dc28e7e4cb147b1b88466cc09
2020-05-12 09:16:14 +00:00
TreeHugger Robot
7499783fd9 Merge changes Idaa27ce2,I06644a72,I453c63fe into rvc-dev
* changes:
  processgroup: Set min_sdk_version
  gralloc: Set min_sdk_version
  libcutils: Set min_sdk_version
2020-05-12 09:00:50 +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
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
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
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
b123c2e1c2 Merge "logd: don't poll() before recvmsg()" am: bf3b47a031 am: de2a239467
Change-Id: If2b27f90f9ec61d260b9da3fd03d4e2968e4e0d8
2020-05-12 01:02:54 +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
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
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
f2caf7de6c Merge "vts_processgroup_validate_test: make deps static" into rvc-dev 2020-05-11 23:33:28 +00:00
Christopher Ferris
1500d0e7a9 Fix mac build.
Add an inline for mmap64 to use on mac.

Bug: 155662887
Bug: 156053599

Test: Builds.
Change-Id: Id02e2c2f40acea2bdef604e9b80b70a85a941927
(cherry picked from commit 8a6dff22dc)
2020-05-11 23:07:53 +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
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
Yifan Hong
d6b307fb15 Merge "vts_processgroup_validate_test: make deps static" 2020-05-11 19:29:39 +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
Woody Lin
d457f68d0a InitFatalReboot: Trigger panic explicitly for init_fatal_panic am: 8fb6e3fdaf
Change-Id: I09a74dfae2132841d859351bce31ba181d753690
2020-05-11 18:00:19 +00:00
Ruchir Rastogi
b797431342 Merge "Use proper platform version checks (libstats)" into rvc-dev 2020-05-11 17:22:24 +00:00