Elliott Hughes
45be42e89e
resolved conflicts for merge of 7af48652 to mnc-dr-dev-plus-aosp
...
Change-Id: Icde642757a1335da49d2f884de33b368888ae709
2015-09-02 20:15:48 -07:00
Dan Willemsen
54afdbaef7
am a4b8f9f1: am bfe32228: Merge "Remove USE_MINGW/CYGWIN; Whitelist windows modules"
...
* commit 'a4b8f9f1c2d9fb6795c81ae39441e720662602d0':
Remove USE_MINGW/CYGWIN; Whitelist windows modules
2015-09-03 02:15:32 +00:00
Steve Fung
83aad11c35
am 8ff2eb51: am 03bbd64a: Merge "crash_reporter: Call dbus-send using chromeos::ProcessImpl"
...
* commit '8ff2eb514aa2484e4785ffef77dcd573a07f920a':
crash_reporter: Call dbus-send using chromeos::ProcessImpl
2015-09-03 00:39:39 +00:00
Bertrand Simonnet
9c9adaf758
am 956818aa: am ad550645: Merge "metricsd: Fix style issues."
...
* commit '956818aa0210ffe5bb36943bb79377a672beab74':
metricsd: Fix style issues.
2015-09-03 00:39:38 +00:00
Bertrand Simonnet
21c04920dc
am 827f6462: am 74f6f8c3: Merge "metricsd: Make the unit tests pass."
...
* commit '827f64625ed03d69543953f48a39e70b85ee3255':
metricsd: Make the unit tests pass.
2015-09-03 00:39:37 +00:00
Dan Willemsen
a4b8f9f1c2
am bfe32228: Merge "Remove USE_MINGW/CYGWIN; Whitelist windows modules"
...
* commit 'bfe322285fdbe86fdc01fdc4c711e22e894bdaee':
Remove USE_MINGW/CYGWIN; Whitelist windows modules
2015-09-03 00:39:19 +00:00
Mark Salyzyn
e1ca19b599
am a4b23123: am 3f5c5a1e: Merge "logd: worst uid record watermark part three" into mnc-dr-dev
...
* commit 'a4b2312387aa7143e8bedb3c3d45ff2bb8033dc3':
logd: worst uid record watermark part three
2015-09-03 00:32:37 +00:00
Mark Salyzyn
8a2f9b8a36
am 287dea69: am bd44f59f: Merge "logd: worst uid record watermark part deux" into mnc-dr-dev
...
* commit '287dea69e71ab5d78192b153dbec0a5210129a39':
logd: worst uid record watermark part deux
2015-09-03 00:32:36 +00:00
Dan Willemsen
bfe322285f
Merge "Remove USE_MINGW/CYGWIN; Whitelist windows modules"
2015-09-03 00:32:09 +00:00
Steve Fung
8ff2eb514a
am 03bbd64a: Merge "crash_reporter: Call dbus-send using chromeos::ProcessImpl"
...
* commit '03bbd64aa99bb03bf80a9340750afa96bdb34280':
crash_reporter: Call dbus-send using chromeos::ProcessImpl
2015-09-03 00:32:02 +00:00
Bertrand Simonnet
956818aa02
am ad550645: Merge "metricsd: Fix style issues."
...
* commit 'ad550645944051f2fb71a599b10cf08e84474035':
metricsd: Fix style issues.
2015-09-03 00:31:59 +00:00
Bertrand Simonnet
827f64625e
am 74f6f8c3: Merge "metricsd: Make the unit tests pass."
...
* commit '74f6f8c323a99586316fb1c01452fefadb3f9b5b':
metricsd: Make the unit tests pass.
2015-09-03 00:31:57 +00:00
Dan Willemsen
87a419c8b1
Remove USE_MINGW/CYGWIN; Whitelist windows modules
...
CYGWIN is not supported, USE_MINGW and HOST_OS==windows are being
replaced with LOCAL_..._windows variables.
Bug: 23566667
Change-Id: I3e4a1e4097dc994cf5abdce6939e83a91758fd75
2015-09-02 17:10:35 -07:00
Steve Fung
03bbd64aa9
Merge "crash_reporter: Call dbus-send using chromeos::ProcessImpl"
2015-09-02 21:33:29 +00:00
Bertrand Simonnet
ad55064594
Merge "metricsd: Fix style issues."
2015-09-02 21:28:11 +00:00
Bertrand Simonnet
74f6f8c323
Merge "metricsd: Make the unit tests pass."
2015-09-02 21:26:40 +00:00
Bertrand SIMONNET
675a10c3d9
metricsd: Fix style issues.
...
This CL:
* removes dead code.
* converts constants static fields into proper constants.
* converts to C++/libchrome some of the parsing logic.
BUG: 22953719
Change-Id: Ief01178c6c268f8ae3690ad9deef42cfb43b2b75
2015-09-02 13:30:54 -07:00
Bertrand SIMONNET
1253186728
metricsd: Make the unit tests pass.
...
This cleans up the unit tests and update them to pass.
Cleaned up:
* removed the irrelevant bits.
* Used ScopedTempDir for all test specific files (instead of the current
directory).
* Update some objects to make them more easily testable.
* Group all the test in a single binary and use bionic's test runner.
BUG: 23682444
Change-Id: I289e3a5ff89968fdecd4a156e93bc38bbc25f58b
2015-09-02 13:30:48 -07:00
Tom Cherry
a2bdc2d91e
am f23ef77f: am 4aa9dbab: Merge "init: Update readme.txt to reflect recent changes to init."
...
* commit 'f23ef77ffe4700221bc47c70ea1b7f1473d0d902':
init: Update readme.txt to reflect recent changes to init.
2015-09-02 19:48:22 +00:00
Tom Cherry
f23ef77ffe
am 4aa9dbab: Merge "init: Update readme.txt to reflect recent changes to init."
...
* commit '4aa9dbab6f78a1acae02d39b96fa572fbfc7b6ed':
init: Update readme.txt to reflect recent changes to init.
2015-09-02 19:37:35 +00:00
Steve Fung
6e68dd72c7
crash_reporter: Call dbus-send using chromeos::ProcessImpl
...
Convert the call to dbus-send from system() to chromeos::ProcessImpl
so that the shell_exec selinux policy can be removed.
Bug: 23280203
Change-Id: I692ebecf5b7f0611de252225cedabcdefd56dff8
2015-09-02 12:29:22 -07:00
Tom Cherry
4aa9dbab6f
Merge "init: Update readme.txt to reflect recent changes to init."
2015-09-02 19:28:00 +00:00
Yasuhiro Matsuda
cf187a007a
am fcdd7ea3: am 7b0bdec4: Merge "Add a tag for tracing system server."
...
* commit 'fcdd7ea34f9b5bf300ed15f4b73e8fa0c42192bc':
Add a tag for tracing system server.
2015-09-02 14:36:32 +00:00
Yasuhiro Matsuda
fcdd7ea34f
am 7b0bdec4: Merge "Add a tag for tracing system server."
...
* commit '7b0bdec4b294dff29af1cf75118be5f3d2b346b9':
Add a tag for tracing system server.
2015-09-02 14:25:48 +00:00
Yasuhiro Matsuda
7b0bdec4b2
Merge "Add a tag for tracing system server."
2015-09-02 12:54:23 +00:00
Elliott Hughes
0b23a08b27
am 1428640f: am 5d804006: Merge "adb/base win32 tests: fix comment and open() flags"
...
* commit '1428640f5cf69ede7dcafa7ae5ecca5a0a4fff50':
adb/base win32 tests: fix comment and open() flags
2015-09-01 22:39:00 +00:00
Tom Cherry
3be66edc59
init: Update readme.txt to reflect recent changes to init.
...
Updates are as follows:
A detailed explanation of event triggers and property triggers
including how they can now be used
A new section describing .rc files, their locations, and the
intentions for each of these locations
A new section describing the import keyword and how it is not a
command but rather its own section
Removal of deprecated or incorrect text
Change-Id: If0a37375ac92a857900f3303ada4ba742360daff
2015-09-01 15:32:33 -07:00
Tom Cherry
af20a7cb12
resolved conflicts for merge of cda81d01 to mnc-dr-dev-plus-aosp
...
Change-Id: I747b279bc49f9f82b8f8859c49b3fc2a4e3b4977
2015-09-01 15:30:56 -07:00
Elliott Hughes
1428640f5c
am 5d804006: Merge "adb/base win32 tests: fix comment and open() flags"
...
* commit '5d8040060515128f2bee9b4759d0618b90c4d70c':
adb/base win32 tests: fix comment and open() flags
2015-09-01 22:10:57 +00:00
Elliott Hughes
5d80400605
Merge "adb/base win32 tests: fix comment and open() flags"
2015-09-01 22:03:41 +00:00
Spencer Low
2fbeb0cc71
adb/base win32 tests: fix comment and open() flags
...
Match base's use of O_BINARY.
Change-Id: I930b5c8fddde20966580069f2e681b99cb26f1a3
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-09-01 14:57:58 -07:00
Tom Cherry
cda81d01c6
am 54c70ca1: Merge "init: Use classes for parsing and clean up memory allocations"
...
* commit '54c70ca15660529466b5b4e091209a20a3e75dff':
init: Use classes for parsing and clean up memory allocations
2015-09-01 21:42:01 +00:00
Tom Cherry
54c70ca156
Merge "init: Use classes for parsing and clean up memory allocations"
2015-09-01 21:35:45 +00:00
Elliott Hughes
9597c6266b
am 995f31ef: am 78ea165e: Merge "Use O_BINARY in base/file for Windows."
...
* commit '995f31efa19d9cd96fcccb560bc67a41f4e81022':
Use O_BINARY in base/file for Windows.
2015-09-01 21:34:14 +00:00
Elliott Hughes
995f31efa1
am 78ea165e: Merge "Use O_BINARY in base/file for Windows."
...
* commit '78ea165ea24e83a979939153ed4d3b075c07a779':
Use O_BINARY in base/file for Windows.
2015-09-01 21:22:25 +00:00
Elliott Hughes
78ea165ea2
Merge "Use O_BINARY in base/file for Windows."
2015-09-01 21:13:33 +00:00
Pat Tjin
7af4865215
am 6442153c: Merge "fastboot: add flashing bootloader commands" into mnc-dr-dev
...
* commit '6442153cbc673ee2f3799ed56eb4965f09ae40b8':
fastboot: add flashing bootloader commands
2015-09-01 21:01:40 +00:00
Mark Salyzyn
a5ce1a6fb0
resolved conflicts for merge of b2205bc7 to mnc-dr-dev-plus-aosp
...
Change-Id: I5e92335814494816607a68325a009c6bd0be4bd0
2015-09-01 13:43:04 -07:00
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
Pat Tjin
6442153cbc
Merge "fastboot: add flashing bootloader commands" into mnc-dr-dev
2015-09-01 20:38:42 +00:00
Elliott Hughes
470d79a09c
Use O_BINARY in base/file for Windows.
...
This matches the behavior of the google3/Chrome APIs. It's probably what you
want in all cases except where you plan on calling Split(content, "\n"), but
we should probably have something like simpleperf's LineReader for that
anyway.
Change-Id: I1a128ed8c328bc95b0b2ef4068a65a8562721418
2015-09-01 13:35:44 -07:00
Mark Salyzyn
a4b2312387
am 3f5c5a1e: Merge "logd: worst uid record watermark part three" into mnc-dr-dev
...
* commit '3f5c5a1e6986a7cdafc4af10f17ddd631da83e40':
logd: worst uid record watermark part three
2015-09-01 20:31:30 +00:00
Mark Salyzyn
287dea69e7
am bd44f59f: Merge "logd: worst uid record watermark part deux" into mnc-dr-dev
...
* commit 'bd44f59f5b1b7d08b5643563b9ab9abfb375e67e':
logd: worst uid record watermark part deux
2015-09-01 20:31:29 +00:00
Mark Salyzyn
b2205bc721
am bc193c53: healthd: logd: add timestamp to kernel logged battery messages
...
* commit 'bc193c53ecc740d0ac3de976c6654b90a24669b6':
healthd: logd: add timestamp to kernel logged battery messages
2015-09-01 20:31:28 +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
Mark Salyzyn
3f5c5a1e69
Merge "logd: worst uid record watermark part three" into mnc-dr-dev
2015-09-01 20:11:11 +00:00
Mark Salyzyn
bd44f59f5b
Merge "logd: worst uid record watermark part deux" into mnc-dr-dev
2015-09-01 20:11:00 +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
Patrick Tjin
51e8b03f84
fastboot: add flashing bootloader commands
...
add the following commands:
flashing unlock_bootloader
flashing lock_bootloader
flashing get_unlock_bootloader_nonce
Change-Id: Ia4f56ebdcb6785a5196cc669d68da1553ed53c58
Signed-off-by: Patrick Tjin <pattjin@google.com>
2015-09-01 12:40:12 -07:00