Mark Salyzyn
1fc1f9f6bb
am 33f213c6: am cb19b08d: logd: refine is_prio
...
* commit '33f213c6069f10c145c0280b938f756ae759c74c':
logd: refine is_prio
2015-09-01 20:40:32 +00:00
Mark Salyzyn
33f213c606
am cb19b08d: logd: refine is_prio
...
* commit 'cb19b08dac6c486f64e0577bc4c0fd92e0ea4552':
logd: refine is_prio
2015-09-01 20:31:27 +00:00
Daniel Rosenberg
11f0d159a1
am eb65ce0a: resolved conflicts for merge of 7c4ed6af
to stage-aosp-master
...
* commit 'eb65ce0a240f9591019b8a40e17d25e86a131e35':
fs_mgr: Add support for A/B partitions
2015-09-01 20:06:42 +00:00
Daniel Rosenberg
eb65ce0a24
resolved conflicts for merge of 7c4ed6af
to stage-aosp-master
...
Change-Id: I52d0f66a6ad329daf19267be817c5a6d7118e7c4
2015-09-01 12:47:48 -07:00
Daniel Rosenberg
7c4ed6af79
Merge "fs_mgr: Add support for A/B partitions"
2015-09-01 19:24:09 +00:00
Elliott Hughes
59224c9537
resolved conflicts for merge of 46603db5
to mnc-dr-dev-plus-aosp
...
Change-Id: I3fb7ff8e9d9313c294620ae0ce63a17766940ec4
2015-09-01 11:25:24 -07:00
Yabin Cui
58c906478c
am 14bf82e2: am 2ae47a0b: Merge "adb: add unit test for fdevent."
...
* commit '14bf82e21f7a8bec4bdeb8092cc2a86e3784fc4f':
adb: add unit test for fdevent.
2015-09-01 16:50:02 +00:00
Yabin Cui
141057767a
am 7a3dc5ea: am 1e19317e: Merge "adb: improve names for transport threads."
...
* commit '7a3dc5eacfb4f016481f97304ad80c510f353ca3':
adb: improve names for transport threads.
2015-09-01 16:50:00 +00:00
Mark Salyzyn
50c500ca88
am 48d88c4b: am 6bb48f07: Merge "logd: worst uid record watermark part three"
...
* commit '48d88c4b69c4c336bda808364e7150a76cd02c3d':
logd: worst uid record watermark part three
2015-09-01 16:49:58 +00:00
Yabin Cui
7685fd5492
am 85c04dfe: am 1531cee6: Merge "adb: remove workaround for b/6558362."
...
* commit '85c04dfeb6cf1a260ab87434fbeb8f315f6caa14':
adb: remove workaround for b/6558362.
2015-09-01 16:49:57 +00:00
Elliott Hughes
c6ab630656
am 8ef6077c: am 1498261f: Merge "Lose uptime to toybox."
...
* commit '8ef6077c15f26896fe9ec70b5dcde941812eb62a':
Lose uptime to toybox.
2015-09-01 16:49:56 +00:00
Elliott Hughes
2fc3653ad9
am 7dbc0936: am b6bfd36c: Merge "Distinguish transport threads."
...
* commit '7dbc0936e858acb5842d35b67caf917e6f459dbb':
Distinguish transport threads.
2015-09-01 16:49:54 +00:00
Siva Velusamy
06c0c391b5
am 1f9d3b07: am c9525ec3: Merge "adb: set thread names (linux & mac)"
...
* commit '1f9d3b07a6d1e1c1d537e4d9711fc2b3e43f3cb9':
adb: set thread names (linux & mac)
2015-09-01 16:49:53 +00:00
Yabin Cui
14bf82e21f
am 2ae47a0b: Merge "adb: add unit test for fdevent."
...
* commit '2ae47a0b54c51d05cfb5bab3e1d7a34d5d15ba1b':
adb: add unit test for fdevent.
2015-09-01 16:37:39 +00:00
Yabin Cui
7a3dc5eacf
am 1e19317e: Merge "adb: improve names for transport threads."
...
* commit '1e19317e575e1020cc0c241c4591a3f95f6a45c4':
adb: improve names for transport threads.
2015-09-01 16:37:35 +00:00
Mark Salyzyn
48d88c4b69
am 6bb48f07: Merge "logd: worst uid record watermark part three"
...
* commit '6bb48f07db448756970266c94b6c7185557ba5a5':
logd: worst uid record watermark part three
2015-09-01 16:37:25 +00:00
Yabin Cui
85c04dfeb6
am 1531cee6: Merge "adb: remove workaround for b/6558362."
...
* commit '1531cee658ecc46a8eda3c1bc13a09fd4fa73eb9':
adb: remove workaround for b/6558362.
2015-09-01 16:37:22 +00:00
Elliott Hughes
8ef6077c15
am 1498261f: Merge "Lose uptime to toybox."
...
* commit '1498261fc5bc8896abbbc586f46992d6bf53ee46':
Lose uptime to toybox.
2015-09-01 16:36:44 +00:00
Elliott Hughes
7dbc0936e8
am b6bfd36c: Merge "Distinguish transport threads."
...
* commit 'b6bfd36c19626ef1aca3b5d28092721c6b498a34':
Distinguish transport threads.
2015-09-01 16:36:41 +00:00
Siva Velusamy
1f9d3b07a6
am c9525ec3: Merge "adb: set thread names (linux & mac)"
...
* commit 'c9525ec366232aa6a0968be1cc8e8abc37df789f':
adb: set thread names (linux & mac)
2015-09-01 16:36:29 +00:00
Elliott Hughes
46603db57a
Merge "Minimal fix for adb backup." into mnc-ub-dev
2015-09-01 16:35:21 +00:00
Yabin Cui
2ae47a0b54
Merge "adb: add unit test for fdevent."
2015-08-31 22:40:04 +00:00
Daniel Rosenberg
8bb2f36abd
fs_mgr: Add support for A/B partitions
...
Allow partitions to be marked as A/B partitions
using the slotselect flag in fstab. The partitions
can be identified by appending the correct suffix
to the block device listed in the fstab. The suffix
is provided by the bootloader through a command line
parameter or the device tree, and can be found in
ro.boot.slot_suffix or read from the boot_control HAL.
Change-Id: I6846d80e857f95bfb8f282f4ab81167394613bbe
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2015-08-31 15:18:05 -07:00
Yabin Cui
1e19317e57
Merge "adb: improve names for transport threads."
2015-08-31 21:21:21 +00:00
Mark Salyzyn
6bb48f07db
Merge "logd: worst uid record watermark part three"
2015-08-31 20:52:29 +00:00
Mark Salyzyn
ccfe8446a1
logd: worst uid record watermark part three
...
Regression that cause records to be preserved for more than a day.
Bug: 23681639
Bug: 23685592
Change-Id: I5e4393c8e3ed935790994c77ec51dc6512a6daa6
2015-08-31 20:51:42 +00:00
Yabin Cui
1531cee658
Merge "adb: remove workaround for b/6558362."
2015-08-31 20:35:45 +00:00
Yabin Cui
d6ab3c2245
adb: improve names for transport threads.
...
The old names seems confusing. output_thread was reading remote data and writing to
local sockets. input_thread was reading local sockets data and writing to remote.
This change tries to make it clear by renaming output_thread to read_transport thread,
and renaming input_thread to write_transport thread.
Change-Id: I2e7b4cde7a94d436f3745e9e3ab10780e7caa8ac
2015-08-31 13:34:27 -07:00
Yabin Cui
c6424585a2
adb: remove workaround for b/6558362.
...
I believe the problem has been fixed in https://android-review.googlesource.com/#/c/168412/ .
So it's time to remove the workaround.
Bug: 6558362
Change-Id: I399c18eda0693f3c51feac07ff59a0a4b5558128
2015-08-31 12:10:11 -07:00
Elliott Hughes
1498261fc5
Merge "Lose uptime to toybox."
2015-08-31 18:48:31 +00:00
Elliott Hughes
b6bfd36c19
Merge "Distinguish transport threads."
2015-08-31 18:00:44 +00:00
Elliott Hughes
0c3914a44d
Distinguish transport threads.
...
Use "<-" and "->" to work around Linux's very short thread name limit.
Bug: http://b/23423333
Change-Id: I9f3f096415b47162dacb660cd0a97ac7ff6107e6
2015-08-31 10:46:05 -07:00
Siva Velusamy
c9525ec366
Merge "adb: set thread names (linux & mac)"
2015-08-31 17:37:31 +00:00
Siva Velusamy
49ee7cf9a1
adb: set thread names (linux & mac)
...
Bug: 23423333
Change-Id: I0069f32ddbae2a10fb130064f721facf45b2cc09
2015-08-31 07:52:52 -07:00
Yabin Cui
bec02fc43d
adb: add unit test for fdevent.
...
Change-Id: Ic26cda5d8e84425bc60ce36bc686bb6917c4ca3c
2015-08-28 21:33:22 -07:00
Elliott Hughes
eb49b05d17
am b77146ce: am 9f07f879: Merge "fatal and fatal_errno should be noreturn."
...
* commit 'b77146ce7cbc5189e760b70d3e367f88bd13c405':
fatal and fatal_errno should be noreturn.
2015-08-29 02:38:23 +00:00
Yabin Cui
3c34f8aa90
am 432ea8f9: am a3bdc6ab: Merge "adb: clean up transport disconnect operations."
...
* commit '432ea8f94e336e3be6f5f5fb5bdf963c05aaff55':
adb: clean up transport disconnect operations.
2015-08-29 02:38:21 +00:00
Elliott Hughes
b77146ce7c
am 9f07f879: Merge "fatal and fatal_errno should be noreturn."
...
* commit '9f07f87908f072d63d8bb9ded91616af8d3edbb4':
fatal and fatal_errno should be noreturn.
2015-08-29 02:30:50 +00:00
Yabin Cui
432ea8f94e
am a3bdc6ab: Merge "adb: clean up transport disconnect operations."
...
* commit 'a3bdc6aba29950b38a4c8ab785e5828451e97140':
adb: clean up transport disconnect operations.
2015-08-29 02:30:49 +00:00
Elliott Hughes
9f07f87908
Merge "fatal and fatal_errno should be noreturn."
2015-08-29 02:22:18 +00:00
Yabin Cui
a3bdc6aba2
Merge "adb: clean up transport disconnect operations."
2015-08-29 02:21:46 +00:00
Elliott Hughes
2f3342fa33
fatal and fatal_errno should be noreturn.
...
Change-Id: I9c5d9cb5ed743d13e65112a111cc9544ec5da339
2015-08-28 19:13:10 -07:00
Elliott Hughes
5e49328df7
am 9382e6c0: am f6224587: Merge "Improve adb tracing."
...
* commit '9382e6c07158f47315d5d5302300459b090c325f':
Improve adb tracing.
2015-08-28 23:45:49 +00:00
Yabin Cui
b329824e6c
adb: clean up transport disconnect operations.
...
Move operations from global functions into member functions.
Add unit test.
Change-Id: Id4543d8e78541eb08c8e629f180c605c699737ec
2015-08-28 16:36:00 -07:00
Elliott Hughes
9382e6c071
am f6224587: Merge "Improve adb tracing."
...
* commit 'f6224587e5fdb8d659172ba5a87a55685a94adf7':
Improve adb tracing.
2015-08-28 23:09:40 +00:00
Elliott Hughes
f6224587e5
Merge "Improve adb tracing."
2015-08-28 21:56:46 +00:00
Elliott Hughes
bd4b1fa4a9
Improve adb tracing.
...
The existing format was unreadable; putting the pid and tid first helps
somewhat. Also remove the unused qemu tracing which wasn't called anywhere.
Change-Id: I37ef3c556fe17b237ba1d8ca3216e2155ce5d0de
2015-08-28 14:46:33 -07:00
Yabin Cui
b13012f75b
am bbe5de23: am 88a51cd4: Merge "adb: call run_transport_disconnects() only once."
...
* commit 'bbe5de230764cff0656ae6d60aa0f33b4c35ea90':
adb: call run_transport_disconnects() only once.
2015-08-28 21:08:42 +00:00
Yabin Cui
bbe5de2307
am 88a51cd4: Merge "adb: call run_transport_disconnects() only once."
...
* commit '88a51cd4d8377516f693720f427511cb40e90b75':
adb: call run_transport_disconnects() only once.
2015-08-28 20:59:30 +00:00
Yabin Cui
88a51cd4d8
Merge "adb: call run_transport_disconnects() only once."
2015-08-28 20:50:07 +00:00