Christopher Ferris
97eead81da
[automerger skipped] Merge "Change call to mmap64." into rvc-dev am: 99dfe5ebba -s ours am: 9a3009ae8e -s ours
...
am skip reason: Change-Id I7a6efbc0d4227403c3d08a08deea56f239382157 with SHA-1 de38b1a356 is in history
Change-Id: Ifa76f8aab6fdf6314056140c4af6dc7e0e1b20e4
2020-05-12 18:24:29 +00:00
Christopher Ferris
1d63ec9534
Merge "Fix mac build." into rvc-dev am: 310b46c1ca am: 9407efae2e
...
Change-Id: I336de72d0c2ed5c909c95ab6e43af51c72c70728
2020-05-12 18:24:13 +00:00
Christopher Ferris
5690324dba
[automerger skipped] Merge "Change call to mmap64." into rvc-dev am: 99dfe5ebba am: 2a7f55cd19 -s ours
...
am skip reason: Change-Id I7a6efbc0d4227403c3d08a08deea56f239382157 with SHA-1 7b9f35c9de is in history
Change-Id: I80afe70b6f0e629702ec6a178a2f71348917814d
2020-05-12 18:24:08 +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
9407efae2e
Merge "Fix mac build." into rvc-dev am: 310b46c1ca
...
Change-Id: I133530e9ff17149241436870ca877c58ec8f3a97
2020-05-12 17:38:46 +00:00
Christopher Ferris
2a7f55cd19
Merge "Change call to mmap64." into rvc-dev am: 99dfe5ebba
...
Change-Id: I0e5a4d43bc06cca14aecd79de12ddc58d5373f62
2020-05-12 17:38:43 +00:00
Christopher Ferris
99dfe5ebba
Merge "Change call to mmap64." into rvc-dev
2020-05-12 17:17:25 +00:00
Christopher Ferris
310b46c1ca
Merge "Fix mac build." into rvc-dev
2020-05-12 17:17:25 +00:00
Tom Cherry
c226504862
Merge changes I9d6dde2c,I38bfcba5 am: a269c7c3d1 am: 0379e27671 am: a0f8962885
...
Change-Id: Ic29b7b0718a7b9415a8e7569706a29f5d127ef3b
2020-05-12 16:37:12 +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
8b007066f1
[automerger skipped] Merge changes Idaa27ce2,I06644a72,I453c63fe into rvc-dev am: 7499783fd9 -s ours am: aa1decbfdb -s ours
...
am skip reason: Change-Id Idaa27ce24cc13d13145eaef85a08b9033922c7bc with SHA-1 d1d5fdfc2a is in history
Change-Id: Ieb8f2627d1bc45d5df8495dd5e56655a8345ca3a
2020-05-12 09:26:57 +00:00
TreeHugger Robot
3b5ac71e20
[automerger skipped] Merge changes Idaa27ce2,I06644a72,I453c63fe into rvc-dev am: 7499783fd9 am: 6e95b881aa -s ours
...
am skip reason: Change-Id Idaa27ce24cc13d13145eaef85a08b9033922c7bc with SHA-1 4f55f3efd3 is in history
Change-Id: Iea68b24a2b1d461a691ef58b2ded09a86c70ffe8
2020-05-12 09:26:41 +00:00
Jooyung Han
3773d98799
[automerger skipped] gralloc: Set min_sdk_version am: 3c20c62cdd am: 6024d5f580 -s ours
...
am skip reason: Change-Id I06644a725eb8f4ce0c7d8e1f09359b55e1b668d7 with SHA-1 72a6b3137e is in history
Change-Id: I5c74373df90e75077da56cd20a36bb1cb95fd107
2020-05-12 09:26:39 +00:00
Jooyung Han
84db725d58
[automerger skipped] libcutils: Set min_sdk_version am: 86455d7f87 am: 6e0951ac9c -s ours
...
am skip reason: Change-Id I453c63fe29607ea0312da5465b03c741486fb670 with SHA-1 88f00f2d43 is in history
Change-Id: I21f5191534050ea1741b645fcc9cb245ed820f6c
2020-05-12 09:26:36 +00:00
TreeHugger Robot
6e95b881aa
Merge changes Idaa27ce2,I06644a72,I453c63fe into rvc-dev am: 7499783fd9
...
Change-Id: Ifa4d5b1872cf5d93f8c389b6912306d6f72e78dc
2020-05-12 09:16:36 +00:00
Jooyung Han
6024d5f580
gralloc: Set min_sdk_version am: 3c20c62cdd
...
Change-Id: Iece8067f824e24eaf069651e7055765604dd2ebf
2020-05-12 09:16:35 +00:00
Jooyung Han
6e0951ac9c
libcutils: Set min_sdk_version am: 86455d7f87
...
Change-Id: I30db0c7d9063957915f86191c9d89a13a8ce1884
2020-05-12 09:16:32 +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
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