Commit graph

27175 commits

Author SHA1 Message Date
Elliott Hughes
dcdfd6dd7e Merge "Allow multiple tcp adb connection to same device." am: 4818194a25 am: e060cdadc8 am: 2337e51f11
am: a4fa877840

Change-Id: Ide69733304ed0f1ca51cb36df3a2da42d7b2997a
2016-10-24 23:48:46 +00:00
Elliott Hughes
a4fa877840 Merge "Allow multiple tcp adb connection to same device." am: 4818194a25 am: e060cdadc8
am: 2337e51f11

Change-Id: I6b450fe6704a3e0497abc1bc5edf251a8c2c025c
2016-10-24 23:44:45 +00:00
Elliott Hughes
2337e51f11 Merge "Allow multiple tcp adb connection to same device." am: 4818194a25
am: e060cdadc8

Change-Id: I62c8f1c466de213c25cd36d03b3b6d7c0a71b989
2016-10-24 23:41:15 +00:00
Elliott Hughes
e060cdadc8 Merge "Allow multiple tcp adb connection to same device."
am: 4818194a25

Change-Id: Id2b6bc99479e94cd94154ca194985f65df7e2afa
2016-10-24 23:36:44 +00:00
Elliott Hughes
4818194a25 Merge "Allow multiple tcp adb connection to same device." 2016-10-24 23:31:14 +00:00
Mark Salyzyn
b71092906f Merge "logd: address code fragility in last watermarks" am: dd153ef247 am: 54977be62b am: b00ad4bbb9
am: b69404f3ca

Change-Id: I069aefbfa47a80ba263e587283a3dffafea82814
2016-10-24 23:23:30 +00:00
Mark Salyzyn
4abf62ea9e Merge "fix regression from android_lookupEventTag_len()" am: 9fa133cc28 am: 6df6448930 am: 41afee2152
am: ee4fe59212

Change-Id: I1a57e6e6d01cb77012e536628819c69389e188a8
2016-10-24 23:23:17 +00:00
Mark Salyzyn
b69404f3ca Merge "logd: address code fragility in last watermarks" am: dd153ef247 am: 54977be62b
am: b00ad4bbb9

Change-Id: I6541c8ca88e1c380ea3dc9e759c6920f5e1357d9
2016-10-24 23:19:26 +00:00
Mark Salyzyn
ee4fe59212 Merge "fix regression from android_lookupEventTag_len()" am: 9fa133cc28 am: 6df6448930
am: 41afee2152

Change-Id: I27f7337ea47d104aff55a62258f38f54d48fce9a
2016-10-24 23:19:13 +00:00
Mark Salyzyn
b00ad4bbb9 Merge "logd: address code fragility in last watermarks" am: dd153ef247
am: 54977be62b

Change-Id: I52691027ea5bff4e05d1fb72450b071907b9a43f
2016-10-24 23:15:54 +00:00
Mark Salyzyn
41afee2152 Merge "fix regression from android_lookupEventTag_len()" am: 9fa133cc28
am: 6df6448930

Change-Id: Icc46d5f670aec79652c1de0d989ee070db9a51b9
2016-10-24 23:15:42 +00:00
Mark Salyzyn
54977be62b Merge "logd: address code fragility in last watermarks"
am: dd153ef247

Change-Id: I4efa93b98429528cc0445eed55cfd593ba2c24d8
2016-10-24 23:12:55 +00:00
Mark Salyzyn
6df6448930 Merge "fix regression from android_lookupEventTag_len()"
am: 9fa133cc28

Change-Id: I8aa5cddb87290eaf86536b567b34cb3119839911
2016-10-24 23:12:42 +00:00
Treehugger Robot
dd153ef247 Merge "logd: address code fragility in last watermarks" 2016-10-24 23:09:15 +00:00
Treehugger Robot
9fa133cc28 Merge "fix regression from android_lookupEventTag_len()" 2016-10-24 23:08:47 +00:00
Mark Salyzyn
c87c48ba7e Merge changes I8c58d6bd,I0a19fd87 am: 291fd678e5 am: d461fd39fb am: 835ee906ab
am: 911a034a21

Change-Id: I45cc0a8d52fa241bb23b8da4f39b086c56abee5e
2016-10-24 23:05:00 +00:00
Mark Salyzyn
a8a8aaacfe bootstat: drop event_log_list_builder am: 343b76e449 am: d601f3ff2c am: e0bf92f3c1
am: 0caa38b045

Change-Id: If394a18a4f733ab009b85b98c403c6611674062f
2016-10-24 23:04:50 +00:00
Mark Salyzyn
de3ae8cfc0 liblog: logd: logcat: Split out log/logger.h into public and private. am: aeaaf81c2c am: 28fcac705b am: df8ca4c0cf
am: 003248a984

Change-Id: I3b6a45c965c814493b7080415f4b3fc2678df3db
2016-10-24 23:04:41 +00:00
Mark Salyzyn
911a034a21 Merge changes I8c58d6bd,I0a19fd87 am: 291fd678e5 am: d461fd39fb
am: 835ee906ab

Change-Id: I15d3c06c943030f376776bde70fd581575110b27
2016-10-24 23:01:25 +00:00
Mark Salyzyn
0caa38b045 bootstat: drop event_log_list_builder am: 343b76e449 am: d601f3ff2c
am: e0bf92f3c1

Change-Id: I68479606160046177f51096bc95fb2275bf402e3
2016-10-24 23:01:17 +00:00
Mark Salyzyn
003248a984 liblog: logd: logcat: Split out log/logger.h into public and private. am: aeaaf81c2c am: 28fcac705b
am: df8ca4c0cf

Change-Id: Idd47b90090afa2bd3f1ef06452625cf935405567
2016-10-24 23:01:11 +00:00
Mark Salyzyn
835ee906ab Merge changes I8c58d6bd,I0a19fd87 am: 291fd678e5
am: d461fd39fb

Change-Id: I51cd639eaa6a4d0ec1d9db6c558a22ab4420a35c
2016-10-24 22:56:59 +00:00
Mark Salyzyn
e0bf92f3c1 bootstat: drop event_log_list_builder am: 343b76e449
am: d601f3ff2c

Change-Id: I6776fd71d0ae16a21aebc7d2500edab984a31c9d
2016-10-24 22:56:51 +00:00
Mark Salyzyn
df8ca4c0cf liblog: logd: logcat: Split out log/logger.h into public and private. am: aeaaf81c2c
am: 28fcac705b

Change-Id: I7ab1efe657155ae67111f58259005bf32f261573
2016-10-24 22:56:42 +00:00
Mark Salyzyn
d461fd39fb Merge changes I8c58d6bd,I0a19fd87
am: 291fd678e5

Change-Id: I61b519494c1b78de65ae37e0e43bb44ae6a95160
2016-10-24 22:53:20 +00:00
Mark Salyzyn
d601f3ff2c bootstat: drop event_log_list_builder
am: 343b76e449

Change-Id: I8b640a4c4b711cd1dfde6d6c80c7df9b73d35b46
2016-10-24 22:53:19 +00:00
Mark Salyzyn
28fcac705b liblog: logd: logcat: Split out log/logger.h into public and private.
am: aeaaf81c2c

Change-Id: I124c69673c30bb5f2259849792ed4ca99f4d6b60
2016-10-24 22:53:11 +00:00
Treehugger Robot
291fd678e5 Merge changes I8c58d6bd,I0a19fd87
* changes:
  bootstat: drop event_log_list_builder
  liblog: logd: logcat: Split out log/logger.h into public and private.
2016-10-24 22:49:29 +00:00
Josh Gao
6170473a0d Merge changes I34ba5757,Ie65a762a am: 63660add3f am: f99573ae8c am: f0742f33ea
am: 9e112c9b44

Change-Id: I0d55fb9f2b678fda485ad5842644938110c2fae1
2016-10-24 21:30:08 +00:00
Josh Gao
b4bcf80a4f adb: fix test_sighup. am: 470622f064 am: 8baf1198ee am: 48ba39854e
am: 7617a039f6

Change-Id: I7b966d56a6fa9ebef5e9725c2518d25e6c844a9b
2016-10-24 21:29:59 +00:00
Josh Gao
ca8174c013 adb: fix race condition in test_non_interactive_sigint. am: e76b9f3dde am: a06580956e am: af9613732f
am: 1ba3df9860

Change-Id: I570266566a659db6831de8a8a9779bcffe6cafbf
2016-10-24 21:29:51 +00:00
Josh Gao
9e112c9b44 Merge changes I34ba5757,Ie65a762a am: 63660add3f am: f99573ae8c
am: f0742f33ea

Change-Id: I37445e01b13ac0540ce9d66c6577f7fe7091e771
2016-10-24 21:26:39 +00:00
Josh Gao
7617a039f6 adb: fix test_sighup. am: 470622f064 am: 8baf1198ee
am: 48ba39854e

Change-Id: I318a37faf0f015450520e6d53fe3db16db13a38d
2016-10-24 21:26:31 +00:00
Josh Gao
1ba3df9860 adb: fix race condition in test_non_interactive_sigint. am: e76b9f3dde am: a06580956e
am: af9613732f

Change-Id: I3ea0261629ef747c41eca9f6af30b871d2182d59
2016-10-24 21:26:22 +00:00
Josh Gao
f0742f33ea Merge changes I34ba5757,Ie65a762a am: 63660add3f
am: f99573ae8c

Change-Id: Iab72bdb684133a81591d915243ca614396a47910
2016-10-24 21:23:01 +00:00
Josh Gao
48ba39854e adb: fix test_sighup. am: 470622f064
am: 8baf1198ee

Change-Id: Icb4da0c75dcb7db6a6b22fea7455d07449315c04
2016-10-24 21:22:52 +00:00
Josh Gao
af9613732f adb: fix race condition in test_non_interactive_sigint. am: e76b9f3dde
am: a06580956e

Change-Id: I30d08aa86ab4103029aa41aaf1451e46f7797948
2016-10-24 21:22:46 +00:00
Josh Gao
f99573ae8c Merge changes I34ba5757,Ie65a762a
am: 63660add3f

Change-Id: I9a3c5dda5edbbcbeb77f519eb6218a5e00d2fdef
2016-10-24 21:18:59 +00:00
Josh Gao
8baf1198ee adb: fix test_sighup.
am: 470622f064

Change-Id: I342cbd04804e3d8d92d04ab088c6980d67bbc8e8
2016-10-24 21:18:58 +00:00
Josh Gao
a06580956e adb: fix race condition in test_non_interactive_sigint.
am: e76b9f3dde

Change-Id: Ib2b6c1118cb48c337c12efbd223c87fee76837f2
2016-10-24 21:18:51 +00:00
Josh Gao
63660add3f Merge changes I34ba5757,Ie65a762a
* changes:
  adb: fix test_sighup.
  adb: fix race condition in test_non_interactive_sigint.
2016-10-24 21:13:18 +00:00
Mark Salyzyn
43dc72ffef Merge "liblog: restructure log/log.h and android/log.h" am: 11a7165ecf am: 9fd2ffc145 am: 5290d85f54
am: 1104ceb573

Change-Id: I34fff2d86ddd3c769dfa59b54a176b5908a0233f
2016-10-24 20:57:04 +00:00
Mark Salyzyn
1104ceb573 Merge "liblog: restructure log/log.h and android/log.h" am: 11a7165ecf am: 9fd2ffc145
am: 5290d85f54

Change-Id: I1b4fb26967d5dfe5af102710fbf9b5170dd19f04
2016-10-24 20:53:34 +00:00
Mark Salyzyn
5290d85f54 Merge "liblog: restructure log/log.h and android/log.h" am: 11a7165ecf
am: 9fd2ffc145

Change-Id: Ifa33b20a139a030d4c6e1e1e41f771d960d3198c
2016-10-24 20:49:03 +00:00
Mark Salyzyn
9fd2ffc145 Merge "liblog: restructure log/log.h and android/log.h"
am: 11a7165ecf

Change-Id: I6ebdebdd82e8a59a711ee0fe41056abdacb084b3
2016-10-24 20:46:08 +00:00
Treehugger Robot
11a7165ecf Merge "liblog: restructure log/log.h and android/log.h" 2016-10-24 20:42:29 +00:00
Mark Salyzyn
9f53cac1b4 fix regression from android_lookupEventTag_len()
Commit 807e40ecc9 'liblog: logd: Add
android_lookupEventTag_len()' which addressed a Dirty Shared memory
leak resulted in a regression. Most notably logcat <tag> stopped
working for the events log buffer.

AndroidLogEntry::tag also requires callers to check out
AndroidLogEntry::tagLen as tag is no longer guaranteed to be
nul terminated.

Test: logcat-unit-tests --gtest_filter=logcat.event_tag_filter
Bug: 31456426
Change-Id: Ibe5236131b640eb5b7e3df0ab4b5f3e25b85ad45
2016-10-24 13:39:19 -07:00
Josh Gao
470622f064 adb: fix test_sighup.
Bug: http://b/32336914
Test: python test_device.py
Change-Id: I34ba5757b5e650d79327dc6779064acd850ce28e
2016-10-24 13:34:20 -07:00
Josh Gao
e76b9f3dde adb: fix race condition in test_non_interactive_sigint.
Fix race condition in the test_non_interactive_sigint test by
looping for a while.

Bug: http://b/32336914
Test: python test_device.py
Change-Id: Ie65a762ad6f04815231add5444762c4c0ffd31cb
2016-10-24 13:34:17 -07:00
Mark Salyzyn
343b76e449 bootstat: drop event_log_list_builder
Use android_log_event_context class instead

Test: manual
Bug: 31456426
Bug: 31750617
Bug: 30465923
Change-Id: I8c58d6bdd1fd921f32a1a6f42bec38937833c0e4
2016-10-24 11:13:16 -07:00