Josh Gao
57af935f1f
Merge "libdebuggerd: fix out of bounds write." am: eb1b202acb
...
am: 3c9ed98fce
Change-Id: If871552e36aa203ff431e9395d565bf6783b9b16
2018-04-20 21:08:28 -07:00
Josh Gao
15045aa79f
Merge changes I4b017701,I28aff510 am: 3e378800b8
...
am: d3e2121d8a
Change-Id: I8abdadeab10f232c41250163fb109bd3ca005569
2018-04-20 21:07:51 -07:00
Jiyong Park
337bc0551d
Merge "Mark libziparchive as double_loadable" am: a7112f4c9b
...
am: b36004c96d
Change-Id: I59160f9ff7ad6a4539617b51b10b9a42b7522479
2018-04-20 21:02:40 -07:00
Josh Gao
3c9ed98fce
Merge "libdebuggerd: fix out of bounds write."
...
am: eb1b202acb
Change-Id: Id3c0b0334fc50812c6e65b307db36977b7eb1150
2018-04-20 19:31:14 -07:00
Josh Gao
d3e2121d8a
Merge changes I4b017701,I28aff510
...
am: 3e378800b8
Change-Id: Iae78bded69ec870b24666b1b0a838bfc0ff10856
2018-04-20 19:30:47 -07:00
Jiyong Park
b36004c96d
Merge "Mark libziparchive as double_loadable"
...
am: a7112f4c9b
Change-Id: Ib2d8fd8e511e67cc6ff0eea3f99bc72c7ba4a940
2018-04-20 19:25:52 -07:00
Treehugger Robot
eb1b202acb
Merge "libdebuggerd: fix out of bounds write."
2018-04-21 02:21:55 +00:00
Treehugger Robot
3e378800b8
Merge changes I4b017701,I28aff510
...
* changes:
libdebuggerd: clone registers before we Unwind with them.
libunwindstack: add Regs::Clone.
2018-04-21 02:15:45 +00:00
Treehugger Robot
a7112f4c9b
Merge "Mark libziparchive as double_loadable"
2018-04-21 02:14:51 +00:00
Josh Gao
83b8ac24b6
libdebuggerd: fix out of bounds write.
...
Bug: http://b/78363964
Test: treehugger
Change-Id: I79ae818e4e0c29f064335d59789afc3b1bf87c69
2018-04-20 17:46:50 -07:00
Elliott Hughes
1fb981b06e
Merge "Lose dd to toybox." am: b1677c15c2
...
am: b1281967aa
Change-Id: I8f03aeb6951bf8e5cb021608977bec53dbbab65d
2018-04-20 15:50:02 -07:00
Elliott Hughes
b1281967aa
Merge "Lose dd to toybox."
...
am: b1677c15c2
Change-Id: Idc91fde82512826860288840449d85e63e6a725b
2018-04-20 15:45:05 -07:00
Treehugger Robot
b1677c15c2
Merge "Lose dd to toybox."
2018-04-20 22:33:27 +00:00
Mark Salyzyn
ca53d9716d
Merge "llkd: bootstat: propagate detailed livelock canonical boot reason" am: 481a8125a6
...
am: 0033edc469
Change-Id: Id05e8ca453e6f761aaa540eadddcd0e18fe28efd
2018-04-20 14:20:20 -07:00
Mark Salyzyn
073f960d70
Merge "llkd: default enabled for userdebug" am: 1803782064
...
am: c9692232e3
Change-Id: I852fa7aae9748d0fc6ef8093378c19e585c017b3
2018-04-20 14:19:48 -07:00
Mark Salyzyn
0033edc469
Merge "llkd: bootstat: propagate detailed livelock canonical boot reason"
...
am: 481a8125a6
Change-Id: I161063e3c33209585d3bbafbd7ee0d1a0c5f151f
2018-04-20 14:17:02 -07:00
Mark Salyzyn
c9692232e3
Merge "llkd: default enabled for userdebug"
...
am: 1803782064
Change-Id: I82cc7f038f56651db8900a57b0bf2898200c4c6e
2018-04-20 14:16:11 -07:00
Treehugger Robot
481a8125a6
Merge "llkd: bootstat: propagate detailed livelock canonical boot reason"
2018-04-20 21:09:04 +00:00
Treehugger Robot
1803782064
Merge "llkd: default enabled for userdebug"
2018-04-20 21:09:00 +00:00
Mark Salyzyn
8093555448
Merge "llkd: add live-lock daemon" am: 656bc24630
...
am: e40838d37a
Change-Id: I7998a53bfc73c36b9687af95c673266f613a5b86
2018-04-20 14:02:42 -07:00
Mark Salyzyn
e40838d37a
Merge "llkd: add live-lock daemon"
...
am: 656bc24630
Change-Id: I3c5e84cf992488f8d077c3a656cf3f0620d1f060
2018-04-20 13:58:05 -07:00
Treehugger Robot
656bc24630
Merge "llkd: add live-lock daemon"
2018-04-20 20:46:41 +00:00
Elliott Hughes
8591440fe2
Lose dd to toybox.
...
Just the symlink for now. If this sticks, I'll come back to remove the code.
Bug: N/A
Test: `toolbox dd --help`
Change-Id: I9b967e9246f42db0d1f48d9d147c538d57fb3bc8
2018-04-20 13:34:20 -07:00
Elliott Hughes
30b408c6f0
Merge changes I1f55c6e1,Ib2adcf0a am: 395131df7b
...
am: 4a9a08183e
Change-Id: Ib571c60a499dd349358d7019d8004906b2acdaee
2018-04-20 13:31:45 -07:00
Elliott Hughes
4a9a08183e
Merge changes I1f55c6e1,Ib2adcf0a
...
am: 395131df7b
Change-Id: Ib0b871e1982828016cefc71976a0e5421388d004
2018-04-20 13:27:17 -07:00
Josh Gao
5d1c14f41b
libdebuggerd: clone registers before we Unwind with them.
...
Bug: http://b/77296294
Test: manual inspection of tombstone generated by crasher
Change-Id: I4b017701d7d2041db4aefbbb90977e99b844c328
2018-04-20 13:23:20 -07:00
Josh Gao
2f37a15472
libunwindstack: add Regs::Clone.
...
Add a way to copy a Regs object.
Bug: http://b/77296294
Test: libunwindstack_test
Change-Id: I28aff510aa3e1b677d5ae46dc3bfe7652817ce52
2018-04-20 13:23:20 -07:00
Elliott Hughes
395131df7b
Merge changes I1f55c6e1,Ib2adcf0a
...
* changes:
Move fastboot over to ParseByteCount.
Add android::base::ParseByteCount.
2018-04-20 20:15:30 +00:00
Mathew Inwood
796a3db702
Merge "Add support for logging complex events from C++." into pi-dev
...
am: 564e3581cb
Change-Id: I69736dce42800878f697c01e3253a33385df6a2b
2018-04-20 00:47:14 -07:00
Mathew Inwood
564e3581cb
Merge "Add support for logging complex events from C++." into pi-dev
2018-04-20 07:42:03 +00:00
Elliott Hughes
542370dead
Move fastboot over to ParseByteCount.
...
Bug: N/A
Test: `fastboot flashall` and `fastboot -S 100m flashall`
Change-Id: I1f55c6e10be74780bbf8dc30b2d4be3f362ac662
2018-04-19 19:49:44 -07:00
Elliott Hughes
955b6a4792
Add android::base::ParseByteCount.
...
Bug: N/A
Test: ran tests
Change-Id: Ib2adcf0a5b9494fcf8259b29974303e8516a9ad9
2018-04-19 19:49:16 -07:00
Luis Hector Chavez
0fe9752696
Merge changes I722d2c41,Ic216ddef am: c4ad6b6adc
...
am: 2c3f1d6c43
Change-Id: Ifb3905acae6e91acde802b118a88cce47fb21077
2018-04-19 19:30:12 -07:00
Luis Hector Chavez
2c3f1d6c43
Merge changes I722d2c41,Ic216ddef
...
am: c4ad6b6adc
Change-Id: I773f941918a21118eddc09d59cdc667fe22833eb
2018-04-19 19:23:53 -07:00
Treehugger Robot
c4ad6b6adc
Merge changes I722d2c41,Ic216ddef
...
* changes:
Improve test_adb.py
adb: Distinguish betwen already-connected and connection failure
2018-04-20 02:13:09 +00:00
Josh Gao
c3d64d0781
Merge "adb: don't error in handle_host_request if we can't acquire a transport." into pi-dev
...
am: 51fd5440c1
Change-Id: Ibfde0dd6f850a69d323c589b49778563a1bea534
2018-04-19 16:04:38 -07:00
Josh Gao
51fd5440c1
Merge "adb: don't error in handle_host_request if we can't acquire a transport." into pi-dev
2018-04-19 22:32:27 +00:00
Josh Gao
5b1c964f95
Merge "adb: don't error in handle_host_request if we can't acquire a transport." am: 224d965be0
...
am: 22bce1788e
Change-Id: Ia6833ef85c666b5fd4682051d9846e45c61cbaeb
2018-04-19 14:59:11 -07:00
Josh Gao
22bce1788e
Merge "adb: don't error in handle_host_request if we can't acquire a transport."
...
am: 224d965be0
Change-Id: If1d8207916095c9fbca83c716f51846f125897b9
2018-04-19 14:52:57 -07:00
Treehugger Robot
224d965be0
Merge "adb: don't error in handle_host_request if we can't acquire a transport."
2018-04-19 21:40:57 +00:00
Tom Cherry
55ef1afe94
[automerger skipped] Merge "Add a dummy entry for the 70220 event tag" into pi-dev
...
am: c415debdbf
-s ours
Change-Id: I0f095831617c7a72cd4fd4e17df71e997c553b15
2018-04-19 14:08:07 -07:00
Tom Cherry
c415debdbf
Merge "Add a dummy entry for the 70220 event tag" into pi-dev
2018-04-19 20:51:39 +00:00
Josh Gao
05e5bc1b17
adb: don't error in handle_host_request if we can't acquire a transport.
...
Host services are attempted after handle_host_request, which means that
failing to find a transport to give to handle_forward_request shouldn't
send an error over to the other end.
Bug: http://b/78294734
Test: `adb track-devices` with multiple devices connected
Change-Id: I46c89cc1894b51d48fea7d4e629b1d57f73e3fd6
(cherry picked from commit 78f133d7d4
)
2018-04-19 13:29:59 -07:00
Josh Gao
78f133d7d4
adb: don't error in handle_host_request if we can't acquire a transport.
...
Host services are attempted after handle_host_request, which means that
failing to find a transport to give to handle_forward_request shouldn't
send an error over to the other end.
Bug: http://b/78294734
Test: `adb track-devices` with multiple devices connected
Change-Id: I46c89cc1894b51d48fea7d4e629b1d57f73e3fd6
2018-04-19 13:09:18 -07:00
Tom Cherry
a6fd1b1b59
Merge "Add a dummy entry for the 70220 event tag" am: 3152c540b4
...
am: 76b17047de
Change-Id: Id433f546af129b048f8db699d55c7ceaa747a0e5
2018-04-19 11:23:33 -07:00
Tom Cherry
76b17047de
Merge "Add a dummy entry for the 70220 event tag"
...
am: 3152c540b4
Change-Id: I1f658a8a09a6a72457069fc109f13040f372dfd9
2018-04-19 11:19:14 -07:00
Tom Cherry
f9ec346f30
Add a dummy entry for the 70220 event tag
...
This will prevent services from reaching out to logd if this tag is
present in the event log.
Bug: 64734187
Test: tree-hugger
Merged-In: If117e1c0cfa678af4190913f0ca87f4e92c54373
Change-Id: If117e1c0cfa678af4190913f0ca87f4e92c54373
(cherry picked from commit dcc4b2bb4a
)
2018-04-19 11:03:28 -07:00
Tom Cherry
3152c540b4
Merge "Add a dummy entry for the 70220 event tag"
2018-04-19 18:02:30 +00:00
Luis Hector Chavez
4ce56af101
Merge "init: Use android::base::boot_clock instead of /proc/uptime" am: 8e73e6f242
...
am: c12004dd23
Change-Id: I3a5a13cefa2baadfb50771664727712f9dd5b803
2018-04-19 10:59:22 -07:00
Luis Hector Chavez
c12004dd23
Merge "init: Use android::base::boot_clock instead of /proc/uptime"
...
am: 8e73e6f242
Change-Id: I32c0ee2092a39af494126b7fbe3f42e0f6c0a2d1
2018-04-19 10:55:15 -07:00