Commit graph

22190 commits

Author SHA1 Message Date
TreeHugger Robot
a7c591ffce Merge "bootstat: Calculate and log the time_since_last_boot metric." into nyc-mr1-dev 2016-08-15 23:24:45 +00:00
James Hawkins
16e84cc1e1 bootstat: Calculate and log the time_since_last_boot metric.
Bug: 28163811
Change-Id: I2e1350531f6a0fc891c270cfdfca6c8ad63f8040
(cherry picked from commit 2d8b3e66c6)
2016-08-15 14:52:29 -07:00
Josh Gao
47a1631f2f Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b am: 9183477cca am: fdb4cd42f6 -s ours am: 0790936473 am: c0e52f145e am: 2b16e16142 am: c8d2050a52 -s ours
am: 9008a5cb80

Change-Id: I8a2df90a4af3d0ecd9fe47c5571f78ab3f6a810d
2016-08-15 19:59:47 +00:00
Josh Gao
dc831be8ba DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421 am: b92fecf460 am: 48cd7ddd89 -s ours am: dc83f1839b am: 3e59e93c71 am: a44a3ae938 am: 240289e7e9 -s ours
am: 2eecaedcb0

Change-Id: I6cddcdc8ecd5388a9017459c17404ea8fe344d7b
2016-08-15 19:59:46 +00:00
Josh Gao
9008a5cb80 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b am: 9183477cca am: fdb4cd42f6 -s ours am: 0790936473 am: c0e52f145e am: 2b16e16142
am: c8d2050a52  -s ours

Change-Id: I27b9571786ea72c31c2fd74d0e033ec0f078f3d9
2016-08-15 19:55:23 +00:00
Josh Gao
2eecaedcb0 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421 am: b92fecf460 am: 48cd7ddd89 -s ours am: dc83f1839b am: 3e59e93c71 am: a44a3ae938
am: 240289e7e9  -s ours

Change-Id: I5fca213679641f0da4cbc5ffdd3b00cf03177946
2016-08-15 19:55:22 +00:00
Josh Gao
c8d2050a52 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b am: 9183477cca am: fdb4cd42f6 -s ours am: 0790936473 am: c0e52f145e
am: 2b16e16142

Change-Id: I2d06b5ec4053884cbf2ba61e77dc642af84020b3
2016-08-15 19:51:15 +00:00
Josh Gao
240289e7e9 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421 am: b92fecf460 am: 48cd7ddd89 -s ours am: dc83f1839b am: 3e59e93c71
am: a44a3ae938

Change-Id: I59be0d4380dbbcdfae4f52a9ae5d7495870ce983
2016-08-15 19:51:14 +00:00
Josh Gao
2b16e16142 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b am: 9183477cca am: fdb4cd42f6 -s ours am: 0790936473
am: c0e52f145e

Change-Id: If95e3aa41a5e1b77fc341693031d12c36ab99fc5
2016-08-15 19:46:46 +00:00
Josh Gao
a44a3ae938 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421 am: b92fecf460 am: 48cd7ddd89 -s ours am: dc83f1839b
am: 3e59e93c71

Change-Id: I2ec5be3ac5b3379428bc1afb000bc80939435e22
2016-08-15 19:46:45 +00:00
Josh Gao
c0e52f145e Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b am: 9183477cca am: fdb4cd42f6 -s ours
am: 0790936473

Change-Id: I65d54a2c52fcc051bca0cb7a586e02b18413ee15
2016-08-15 19:42:16 +00:00
Josh Gao
3e59e93c71 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421 am: b92fecf460 am: 48cd7ddd89 -s ours
am: dc83f1839b

Change-Id: I8c2ea607c5a0d4af2114cddd5ebf04f69c30c58e
2016-08-15 19:42:15 +00:00
Josh Gao
0790936473 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b am: 9183477cca
am: fdb4cd42f6  -s ours

Change-Id: Ie74b4d7f058f5309835467b1f2b0c7af10a3deb5
2016-08-15 19:38:14 +00:00
Josh Gao
dc83f1839b DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421 am: b92fecf460
am: 48cd7ddd89  -s ours

Change-Id: Iaaf6bda3c6331c437116cde7913a5b8562854390
2016-08-15 19:38:14 +00:00
Josh Gao
fdb4cd42f6 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours am: 55259f320b
am: 9183477cca

Change-Id: Idf1fc233cf76a144b1f410962f6b2b5527867c42
2016-08-15 19:33:36 +00:00
Josh Gao
48cd7ddd89 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours am: 7fe65ab421
am: b92fecf460

Change-Id: Ie10d035b8a18c39bd15e72afc6f270fe33aff63a
2016-08-15 19:33:35 +00:00
Josh Gao
9183477cca Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours am: 58dd6f7cba -s ours
am: 55259f320b

Change-Id: I7a4c95b1d5b4ec51fea7867e490d50cb9138871d
2016-08-15 19:10:12 +00:00
Josh Gao
b92fecf460 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours am: 2071bcfa75 -s ours
am: 7fe65ab421

Change-Id: I5ff20f785127d356eae5c0626cc4cc994d638109
2016-08-15 19:10:11 +00:00
Josh Gao
55259f320b Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a am: 7ed0995930 -s ours
am: 58dd6f7cba  -s ours

Change-Id: Ia416c2ddc18630671ab7e27d25792dd601f309df
2016-08-15 19:05:10 +00:00
Josh Gao
7fe65ab421 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours am: be9d9fc379 -s ours
am: 2071bcfa75  -s ours

Change-Id: I491d40595bf23ea2a8b9db6df1c57b6e6e281604
2016-08-15 19:05:10 +00:00
Josh Gao
58dd6f7cba Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee am: ac3fbb1a4a
am: 7ed0995930  -s ours

Change-Id: I5e4be4eaca413d2f1a8027cf5fa69be9e1d9a644
2016-08-15 19:01:10 +00:00
Josh Gao
2071bcfa75 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee am: 8f7cc0e387 -s ours
am: be9d9fc379  -s ours

Change-Id: I8c637fa765c4f6b79354855f245e78b82b87e3bf
2016-08-15 19:01:10 +00:00
Josh Gao
7ed0995930 Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev am: 23effb07ee
am: ac3fbb1a4a

Change-Id: I6988483d7d461c1accdb27130517d11d0fdd7f0e
2016-08-15 18:57:27 +00:00
Josh Gao
be9d9fc379 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process. am: 8d6ca194ee
am: 8f7cc0e387  -s ours

Change-Id: I073d06e3ee81c39bfaca866783de2113ac13cf72
2016-08-15 18:57:09 +00:00
Josh Gao
ac3fbb1a4a Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev
am: 23effb07ee

Change-Id: If1aa441cf204ce5f3e56b9c1d2637acae72a83e1
2016-08-15 18:29:09 +00:00
Josh Gao
8f7cc0e387 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process.
am: 8d6ca194ee

Change-Id: I1459607b655da6e01bd5d59e31bdb6d79d504431
2016-08-15 18:29:09 +00:00
Josh Gao
23effb07ee Merge "DO NOT MERGE: debuggerd: verify that traced threads belong to the right process." into klp-dev 2016-08-15 18:18:44 +00:00
Mark Salyzyn
f34d76ea65 logd: klogd crash (part deux)
(cherry pick from commit 83b247891c)

LogBuffer::pidToUid(pid_t pid) { return stats.pidToUid(pid); }
needs to have LogBuffer::lock()/unlock() to prevent unordered_map
data corruption. This can lead to multiple symptoms, crashes and
continuous spins on corrupted iterators.

Bug: 30688716
Bug: 30050636
Bug: 30614675
Bug: 25620123
Bug: 30792935
Change-Id: I1d8fec8e5fda98c6a08645e7456b081507696b3c
2016-08-12 07:31:47 -07:00
Josh Gao
c1167dd4c9 Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392 am: 8dad649c6d -s ours
am: cfb8b6aea6

Change-Id: I1d064970bcc827b16feb4ac03268964869b15ccc
2016-08-11 20:32:49 +00:00
Josh Gao
557d55afd5 DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f am: 5cee87ea25 am: 09b5b49e9b -s ours
am: 8b2a975e12

Change-Id: I0950169fe2ff83f08f04bbecba9644dc456e2532
2016-08-11 20:32:48 +00:00
Josh Gao
cfb8b6aea6 Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392
am: 8dad649c6d  -s ours

Change-Id: Ic0c3050f457e3ccdd7ec101b74e61aae7a49f1b1
2016-08-11 20:29:12 +00:00
Josh Gao
8b2a975e12 DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f am: 5cee87ea25
am: 09b5b49e9b  -s ours

Change-Id: I51de5bec7e0927a180b127271addb06bb0ff9e7b
2016-08-11 20:29:11 +00:00
Josh Gao
8dad649c6d Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8
am: 00d389f392

Change-Id: I37bd5978fd4ca52eda6960116103d321eef432fb
2016-08-11 20:26:11 +00:00
Josh Gao
09b5b49e9b DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f
am: 5cee87ea25

Change-Id: I76cecf9ef71ce9f631130868d402125b1e6ba9e3
2016-08-11 20:26:11 +00:00
Josh Gao
00d389f392 Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c
am: 015d662cb8

Change-Id: I3cb4380aeb347bf255c4fb6f4430db62e4a83407
2016-08-11 20:22:40 +00:00
Josh Gao
5cee87ea25 DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e
am: 5c4bf3d66f

Change-Id: I4977bc17d446cc2b8959058e3e13ccf17e10857b
2016-08-11 20:22:40 +00:00
Josh Gao
015d662cb8 Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev
am: 73c59ad77c

Change-Id: I04df96934b6ea82865f94fcff0daf1bbd9ba63d2
2016-08-11 20:19:09 +00:00
Josh Gao
5c4bf3d66f DO NOT MERGE: adb: reenable (and fix) Windows build.
am: 804de7a29e

Change-Id: I4dc4d5cb64c4757894fbdff1b3e12426aa965aa7
2016-08-11 20:19:09 +00:00
TreeHugger Robot
73c59ad77c Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev 2016-08-11 20:09:30 +00:00
Josh Gao
804de7a29e DO NOT MERGE: adb: reenable (and fix) Windows build.
This branch is still getting used to build some SDK targets.

Bug: http://b/30767018
Change-Id: I85b03a80d69ceef5e5333505f0832129387ed2da
2016-08-11 11:29:43 -07:00
Badhri Jagan Sridharan
031afc0dba Merge "Remove redundant action triggers on persist.sys.usb.config" into nyc-mr1-dev 2016-08-10 22:16:28 +00:00
Josh Gao
faa7e41a7f debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f am: fe59793375 am: 073f731836 am: 647ec18a9d -s ours
am: 364188b9d8

Change-Id: I41987b2c560d7c49bb5bc04862a4c40c6831c339
2016-08-09 23:55:08 +00:00
Josh Gao
364188b9d8 debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f am: fe59793375 am: 073f731836
am: 647ec18a9d  -s ours

Change-Id: I01df2746300f5349660988f797bf17d3a3e3994f
2016-08-09 23:52:35 +00:00
Josh Gao
647ec18a9d debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f am: fe59793375
am: 073f731836

Change-Id: If0a221d5fcfe25c7e731de4039318a24cd5cb782
2016-08-09 23:28:30 +00:00
Josh Gao
073f731836 debuggerd: fix missed use of ptrace(PTRACE_ATTACH). am: 8b6b654a5f
am: fe59793375

Change-Id: I22b74c49b17eeb17c46891e4404a2ca8c562bea7
2016-08-09 23:25:31 +00:00
Josh Gao
fe59793375 debuggerd: fix missed use of ptrace(PTRACE_ATTACH).
am: 8b6b654a5f

Change-Id: Iebf1eb6f47a917c84c3e5f1bd16d9ed5f3a487ae
2016-08-09 23:23:00 +00:00
Josh Gao
8b6b654a5f debuggerd: fix missed use of ptrace(PTRACE_ATTACH).
Bug: http://b/29555636
Change-Id: Ibd8a2e2b619b74aac667555b7085d6f28e367c07
2016-08-09 15:52:26 -07:00
Mark Salyzyn
fbbf99256a logd: klogd crash
(cherry pick from commit a146a779e2)

dmesg parser could wrap taglen limit resulting in out of bound
accesses. Can lead to crash or data corruption.

Fixed an issue with two-word tag parsing. Switched to case
insensitive tag content matching. Added a few extra limit
checks that could also wrap, simplified the parsing, then added
means to stop using hard coded constants.

Bug: 30688716
Bug: 30050636
Bug: 30614675
Bug: 25620123
Change-Id: Iae4f664f63ef7b842d82eaa1638b6d7a0d28fd18
2016-08-09 07:52:09 -07:00
Felipe Leme
9a882a3ef3 Ignore bugreportz output when it's not supported.
On devices running M or below, calling 'bugreportz -v' writes
'/system/bin/sh: bugreportz: not found' in the stdout output, which must
be redirected to stderr so it's not shown in the flat-file bugreport,
above the bugreport header.

BUG: 30451114

Change-Id: I942c92fdf6ae85e0cde7b9f94b9eb0b1fecad77a
2016-08-04 13:12:39 -07:00
TreeHugger Robot
aed7048ce0 Merge changes from topic 'bug_30451114' into nyc-mr1-dev
* changes:
  Deprecated 'adb bugreport' with flat files.
  Minor improvements on bugreport generation.
2016-08-04 14:44:35 +00:00