David Pursell
21bfc391ea
am 2017030b: am d9076f21: Merge "adb: Kill subprocess when the client exits."
...
* commit '2017030b49b22b9abc4b47cc1d15882d7e7f3e21':
adb: Kill subprocess when the client exits.
2015-09-15 21:19:14 +00:00
David Pursell
2017030b49
am d9076f21: Merge "adb: Kill subprocess when the client exits."
...
* commit 'd9076f2132006505227e5fec91926acb512c3d68':
adb: Kill subprocess when the client exits.
2015-09-15 20:04:58 +00:00
David Pursell
d9076f2132
Merge "adb: Kill subprocess when the client exits."
2015-09-15 18:27:33 +00:00
David Pursell
544e795fbb
adb: Kill subprocess when the client exits.
...
When the client exits (e.g. with Ctrl+C) the subprocess should be
notified as well so it can cleanup if needed.
Bug: http://b/23825725
Change-Id: Idb771710b293e0a9f7bebc9e2814b3a816e2c50e
2015-09-15 10:16:24 -07:00
David Pursell
de6aed81c8
am a3ef4fad: am 0af19a0e: Merge "adb: Fix missing shell protocol usage."
...
* commit 'a3ef4fad70692c88819b95a41437c03e9a3398a6':
adb: Fix missing shell protocol usage.
2015-09-15 15:18:55 +00:00
David Pursell
a3ef4fad70
am 0af19a0e: Merge "adb: Fix missing shell protocol usage."
...
* commit '0af19a0e82d7808678f3b92a8c5b4b8cb80ee216':
adb: Fix missing shell protocol usage.
2015-09-15 15:12:33 +00:00
David Pursell
0af19a0e82
Merge "adb: Fix missing shell protocol usage."
2015-09-15 15:06:42 +00:00
Steve Fung
4ba7715f83
am 62b37a90: am f5974755: Merge "crash_reporter: Add model_manifest_id field to report"
...
* commit '62b37a90c1350d383523c9f5398e18875d3239c4':
crash_reporter: Add model_manifest_id field to report
2015-09-15 05:02:07 +00:00
Steve Fung
62b37a90c1
am f5974755: Merge "crash_reporter: Add model_manifest_id field to report"
...
* commit 'f597475599232ace977dcbfca8b5860165b2c281':
crash_reporter: Add model_manifest_id field to report
2015-09-15 04:52:58 +00:00
Steve Fung
f597475599
Merge "crash_reporter: Add model_manifest_id field to report"
2015-09-15 04:47:35 +00:00
Steve Fung
6f710a8cfb
am 576317af: am 33046dcb: Merge "crash_reporter: Ensure crash_sender spread time is not negative"
...
* commit '576317af98bd4976043a421c3c029d0dc7d1ecfe':
crash_reporter: Ensure crash_sender spread time is not negative
2015-09-15 01:20:39 +00:00
Steve Fung
576317af98
am 33046dcb: Merge "crash_reporter: Ensure crash_sender spread time is not negative"
...
* commit '33046dcbfa39fcd0ae29b506a84ec90e5bdfad3d':
crash_reporter: Ensure crash_sender spread time is not negative
2015-09-15 01:13:35 +00:00
Steve Fung
33046dcbfa
Merge "crash_reporter: Ensure crash_sender spread time is not negative"
2015-09-15 01:06:09 +00:00
Steve Fung
ed78930923
crash_reporter: Add model_manifest_id field to report
...
Add the model_manifest_id from weave's configuration to the
crash report.
Bug: 22874192
Change-Id: I26d5334a6eb3b82fd07338e98ce0f3efbb2ff16d
2015-09-14 16:16:27 -07:00
Bertrand Simonnet
2f146a5a60
am c6a66bf1: am 3ef7f0af: Merge "metricsd: Add test case for the upload service."
...
* commit 'c6a66bf1cfdfd35e3289fbfd3fb16be795def9f9':
metricsd: Add test case for the upload service.
2015-09-14 22:58:13 +00:00
Bertrand Simonnet
2fe03177cf
am 7ad4171f: am dd11d286: Merge "metricsd: Persist the report to disk if an upload fails."
...
* commit '7ad4171f3ca8654e65016119fe9b37749f80f535':
metricsd: Persist the report to disk if an upload fails.
2015-09-14 22:58:12 +00:00
Bertrand Simonnet
4369c1e788
am 7fb08a74: am a9f1ed16: Merge "metricsd: Use the metrics directory everywhere."
...
* commit '7fb08a74fd1f1cc805fcec1eb672e0c1ef714a46':
metricsd: Use the metrics directory everywhere.
2015-09-14 22:58:11 +00:00
Bertrand Simonnet
c6a66bf1cf
am 3ef7f0af: Merge "metricsd: Add test case for the upload service."
...
* commit '3ef7f0afb86be9473728f4fb3679be0c6f21ff82':
metricsd: Add test case for the upload service.
2015-09-14 22:53:11 +00:00
Bertrand Simonnet
7ad4171f3c
am dd11d286: Merge "metricsd: Persist the report to disk if an upload fails."
...
* commit 'dd11d286caa881e135eaec64095d5e6bbc406b44':
metricsd: Persist the report to disk if an upload fails.
2015-09-14 22:53:10 +00:00
Bertrand Simonnet
7fb08a74fd
am a9f1ed16: Merge "metricsd: Use the metrics directory everywhere."
...
* commit 'a9f1ed16a839ec4cc974e66734c11a01e8d71820':
metricsd: Use the metrics directory everywhere.
2015-09-14 22:53:08 +00:00
Bertrand Simonnet
3ef7f0afb8
Merge "metricsd: Add test case for the upload service."
2015-09-14 22:48:39 +00:00
Bertrand Simonnet
dd11d286ca
Merge "metricsd: Persist the report to disk if an upload fails."
2015-09-14 22:48:32 +00:00
Bertrand Simonnet
a9f1ed16a8
Merge "metricsd: Use the metrics directory everywhere."
2015-09-14 22:48:25 +00:00
David Pursell
71c83126a8
adb: Fix missing shell protocol usage.
...
Some adb commands use the shell service but weren't using the
shell protocol, causing a protocol mismatch between the client and
the device. This CL uses the shell protocol whenever possible.
Change-Id: I4c9c75b7fd1d5bf3dc1f73900711840270527682
2015-09-14 15:33:50 -07:00
Steve Fung
eab7746acb
am 9179c217: am 758db4db: Merge "crash_reporter: Read crash server from property"
...
* commit '9179c2170566459864d68dbec488b6e03e0ebb10':
crash_reporter: Read crash server from property
2015-09-14 22:18:51 +00:00
Steve Fung
18ca9b364b
crash_reporter: Ensure crash_sender spread time is not negative
...
When calculating the crash_sender spread time, make sure that the
random number is not negative when converted to a shell int variable.
Bug: 24004011
Change-Id: I3b95dc244a26270ef2b93d5af4b0593a93eedcad
2015-09-14 22:18:24 +00:00
Steve Fung
9179c21705
am 758db4db: Merge "crash_reporter: Read crash server from property"
...
* commit '758db4dbe7ffc3176c25f615eb306bdeb2be2f50':
crash_reporter: Read crash server from property
2015-09-14 22:13:58 +00:00
Steve Fung
758db4dbe7
Merge "crash_reporter: Read crash server from property"
2015-09-14 22:06:19 +00:00
Bertrand SIMONNET
4c8a8ad3bf
metricsd: Add test case for the upload service.
...
This test case ensures that we can log a metric with the metrics library
and upload it with the upload service.
BUG: 22879646
TEST: unit tests.
Change-Id: Idf4a1240d41745ebf7835089230608082eed19f5
2015-09-14 13:55:33 -07:00
Bertrand SIMONNET
1df10c43ea
metricsd: Persist the report to disk if an upload fails.
...
If the metrics server is unreachable, we may need to resend a metrics
report later. Instead of keeping the staged report in memory, save it to
disk to avoid loosing data if the system restarts or crashes.
BUG: 23033262
TEST: unit tests.
Change-Id: Idd14964e40f022952469f47d675d8cda9586d7cd
2015-09-14 13:55:33 -07:00
Bertrand SIMONNET
2765d0abcc
metricsd: Use the metrics directory everywhere.
...
Instead of passing different filenames around, only rely on the metrics
directory and infer the filepath from it. This makes testing easier.
BUG: 23939404
TEST: unit tests.
Change-Id: I79086acc3a546464114fa8ec4656ec04e1c43e35
2015-09-14 13:55:28 -07:00
Steve Fung
44aec5f4af
crash_reporter: Read crash server from property
...
Read the crash server URL from the crash_reporter.server
property. If it is not set, return a configuration error.
Bug: 22874192
Change-Id: Iac341b6352fe9c1b54cd2e8561ed4a5bbe8ddddc
2015-09-14 20:50:33 +00:00
Steve Fung
a6327627c0
am 57d4510e: am 88880fd8: Merge "crash_reporter: Fix a couple crash_sender issues"
...
* commit '57d4510e0aff0c8d99bf60aeb9b056112f4ad2a5':
crash_reporter: Fix a couple crash_sender issues
2015-09-14 20:31:15 +00:00
Steve Fung
57d4510e0a
am 88880fd8: Merge "crash_reporter: Fix a couple crash_sender issues"
...
* commit '88880fd8a906b2bcd5fe98e99ff475d812ad6d4f':
crash_reporter: Fix a couple crash_sender issues
2015-09-14 20:24:48 +00:00
Steve Fung
88880fd8a9
Merge "crash_reporter: Fix a couple crash_sender issues"
2015-09-14 20:08:43 +00:00
Bertrand Simonnet
18c6b1786f
am a2726976: am eeedcc41: Merge "metricsd: Collect generic stats about the system."
...
* commit 'a2726976d3857683ee84793c8278ce299b72da69':
metricsd: Collect generic stats about the system.
2015-09-14 18:57:12 +00:00
David Pursell
e4c0454083
am 07448e07: am 76f4a653: Merge changes from topic \'adb_shell\'
...
* commit '07448e072e50703b01aca9f99cf03ead030746de':
adb: add client side shell protocol and enable.
adb: implement shell protocol.
2015-09-14 18:52:42 +00:00
Bertrand Simonnet
a2726976d3
am eeedcc41: Merge "metricsd: Collect generic stats about the system."
...
* commit 'eeedcc4150d9e48fabfd3f142c8e4f05d09f82b0':
metricsd: Collect generic stats about the system.
2015-09-14 18:49:44 +00:00
David Pursell
07448e072e
am 76f4a653: Merge changes from topic \'adb_shell\'
...
* commit '76f4a6533c6b803e267225b42c5dda63f23bf3ea':
adb: add client side shell protocol and enable.
adb: implement shell protocol.
2015-09-14 18:45:34 +00:00
Bertrand Simonnet
eeedcc4150
Merge "metricsd: Collect generic stats about the system."
2015-09-14 18:44:24 +00:00
David Pursell
76f4a6533c
Merge changes from topic 'adb_shell'
...
* changes:
adb: add client side shell protocol and enable.
adb: implement shell protocol.
2015-09-14 18:39:37 +00:00
Elliott Hughes
926b781877
am 3bfb5283: am ad1c0bb5: Merge "Lose du to toybox."
...
* commit '3bfb52834617e5d0f756c71c322f93cf4e24a957':
Lose du to toybox.
2015-09-14 18:03:10 +00:00
Elliott Hughes
3bfb528346
am ad1c0bb5: Merge "Lose du to toybox."
...
* commit 'ad1c0bb5fd29d970514362388c00ced594b5acb4':
Lose du to toybox.
2015-09-14 17:59:12 +00:00
Elliott Hughes
ad1c0bb5fd
Merge "Lose du to toybox."
2015-09-14 17:50:09 +00:00
Elliott Hughes
5cf29bc9f9
Lose du to toybox.
...
Change-Id: Ib240f74990274027258a454d3c63202791fcdb0b
2015-09-14 10:37:52 -07:00
David Zeuthen
5b0f822492
am 77557e90: am d906b297: Merge "fs_mgr: Error out if unable to determine slot_suffix"
...
* commit '77557e90915d600028d17c513c70309ab706ef55':
fs_mgr: Error out if unable to determine slot_suffix
2015-09-14 15:47:31 +00:00
David Zeuthen
77557e9091
am d906b297: Merge "fs_mgr: Error out if unable to determine slot_suffix"
...
* commit 'd906b2973b9f708b34d4df90a2496753f83199ec':
fs_mgr: Error out if unable to determine slot_suffix
2015-09-14 15:39:49 +00:00
David Zeuthen
d906b2973b
Merge "fs_mgr: Error out if unable to determine slot_suffix"
2015-09-14 15:33:35 +00:00
Mark Salyzyn
bd1da05720
am f24699f0: am 93807d47: Merge "logd: worst uid record watermark part five" into mnc-dr-dev
...
* commit 'f24699f0f4c7f266f14f1f682aca7ac1a8c2336b':
logd: worst uid record watermark part five
2015-09-14 14:37:08 +00:00
Mark Salyzyn
f24699f0f4
am 93807d47: Merge "logd: worst uid record watermark part five" into mnc-dr-dev
...
* commit '93807d472d7c3745cae539af881aefbf5e211d5f':
logd: worst uid record watermark part five
2015-09-14 14:31:13 +00:00