Tom Cherry
a4c0591513
Merge "fs_mgr: convert libfs_mgr to Android.bp" am: 3d33dae74d
...
am: 4c4f1f99be
2017-05-18 20:31:28 +00:00
Tom Cherry
4c4f1f99be
Merge "fs_mgr: convert libfs_mgr to Android.bp"
...
am: 3d33dae74d
2017-05-18 20:26:31 +00:00
Tom Cherry
3d33dae74d
Merge "fs_mgr: convert libfs_mgr to Android.bp"
2017-05-18 20:18:00 +00:00
Dmitry Shmidt
a4866d9e8b
Merge "libnetutils: Rename dhcptool to dhcpdbg" am: 9397adabd8
...
am: 482ca8ee38
2017-05-18 01:27:14 +00:00
Dmitry Shmidt
482ca8ee38
Merge "libnetutils: Rename dhcptool to dhcpdbg"
...
am: 9397adabd8
2017-05-18 01:23:48 +00:00
Treehugger Robot
9397adabd8
Merge "libnetutils: Rename dhcptool to dhcpdbg"
2017-05-18 01:11:32 +00:00
Ruchi Kandoi
12ab08b182
Merge "Add the functionality for logging counters." am: 7868a0d82f
...
am: d94b674d58
2017-05-17 23:10:48 +00:00
Ruchi Kandoi
d94b674d58
Merge "Add the functionality for logging counters."
...
am: 7868a0d82f
2017-05-17 23:07:16 +00:00
Treehugger Robot
7868a0d82f
Merge "Add the functionality for logging counters."
2017-05-17 22:59:55 +00:00
Mark Salyzyn
ef53957a7e
Merge "Revert "logd: remove start filtration from flushTo"" am: 8cfd2971ec
...
am: f111b04f15
2017-05-17 21:44:38 +00:00
Mark Salyzyn
f111b04f15
Merge "Revert "logd: remove start filtration from flushTo""
...
am: 8cfd2971ec
2017-05-17 21:41:08 +00:00
Treehugger Robot
8cfd2971ec
Merge "Revert "logd: remove start filtration from flushTo""
2017-05-17 21:30:20 +00:00
David Zeuthen
984757365f
Merge "adb: Allow disabling verity on eng builds when using AVB." am: 7ce0f00c08
...
am: 1ceea342d5
2017-05-17 21:20:25 +00:00
David Zeuthen
1ceea342d5
Merge "adb: Allow disabling verity on eng builds when using AVB."
...
am: 7ce0f00c08
2017-05-17 21:17:06 +00:00
Treehugger Robot
7ce0f00c08
Merge "adb: Allow disabling verity on eng builds when using AVB."
2017-05-17 21:11:46 +00:00
Elliott Hughes
ce49fc9d0a
Merge "libcutils should #include <sys/sysmacros.h>" am: c3b931aad3
...
am: 2668f35d31
2017-05-17 20:51:04 +00:00
Elliott Hughes
2668f35d31
Merge "libcutils should #include <sys/sysmacros.h>"
...
am: c3b931aad3
2017-05-17 20:47:03 +00:00
Treehugger Robot
c3b931aad3
Merge "libcutils should #include <sys/sysmacros.h>"
2017-05-17 20:39:39 +00:00
Ruchi Kandoi
b63072e4d0
Add the functionality for logging counters.
...
Also correct clang-format for libmetricslogger
Test: Run libmetriclogger_test
Change-Id: If61f0bdc394a43e249ec4691da70175eeaf4cec6
2017-05-17 13:18:16 -07:00
Mark Salyzyn
eb45db2cf4
Revert "logd: remove start filtration from flushTo"
...
Regressed by introducing too much overlap in the results.
This reverts commit 982ad208b5
2017-05-17 19:55:12 +00:00
Elliott Hughes
6903e671eb
Merge "Fix "fastboot flashing"." am: 67529d29ca
...
am: ccf078da71
2017-05-17 18:54:13 +00:00
Elliott Hughes
ccf078da71
Merge "Fix "fastboot flashing"."
...
am: 67529d29ca
2017-05-17 18:50:57 +00:00
Elliott Hughes
d77b537732
libcutils should #include <sys/sysmacros.h>
...
Bug: https://github.com/android-ndk/ndk/issues/398
Test: builds
Change-Id: I8ca21a74e2856fde09c284aee1343c627d8381e6
2017-05-17 11:36:51 -07:00
David Zeuthen
abddbc2cdf
adb: Allow disabling verity on eng builds when using AVB.
...
Unlike VB1.0, if a device is using AVB then dm-verity is used on any
build (userdebug, eng, etc.). Therefore, we should allow disabling
verity on any build (except USER), not just userdebug. This bug was
pointed out in https://android-review.googlesource.com/#/c/371372/
Bug: 34124301
Test: Manually tested on -eng build on device using AVB.
Change-Id: I314550c13d7458d5d1ef68eb06f98849e11fbe15
2017-05-17 14:28:47 -04:00
Treehugger Robot
67529d29ca
Merge "Fix "fastboot flashing"."
2017-05-17 18:25:23 +00:00
Dmitry Shmidt
d3b2d4ff2e
libnetutils: Rename dhcptool to dhcpdbg
...
Also print warning that IP will not allow full connectivity.
Test: Manual
Change-Id: I264c478f07236108a01e766c5264897c2000f008
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2017-05-17 10:47:28 -07:00
Chris Wren
43bae3f568
Merge "port metrics_logger to v2 format" am: 75a8233c7e
...
am: d28d543c48
2017-05-17 17:29:19 +00:00
Chris Wren
d28d543c48
Merge "port metrics_logger to v2 format"
...
am: 75a8233c7e
2017-05-17 17:25:20 +00:00
Treehugger Robot
75a8233c7e
Merge "port metrics_logger to v2 format"
2017-05-17 17:21:55 +00:00
Chris Wren
936fbbdef8
port metrics_logger to v2 format
...
Bug: 34450377
Test: manual, needs to be a cross-language test
Change-Id: Ib89a48f2c52428deff863b0c28f3c10e7333c8a2
(cherry picked from commit 081492552c
2017-05-17 10:18:26 -07:00
Dmitry Shmidt
cebd49c93f
Merge "libnetutils: Restore dhcptool" am: b03d5a4ba6
...
am: 1f47a6ba48
2017-05-16 23:29:24 +00:00
Dmitry Shmidt
1f47a6ba48
Merge "libnetutils: Restore dhcptool"
...
am: b03d5a4ba6
2017-05-16 23:17:53 +00:00
Treehugger Robot
b03d5a4ba6
Merge "libnetutils: Restore dhcptool"
2017-05-16 23:13:57 +00:00
Dmitry Shmidt
bc592761c9
libnetutils: Restore dhcptool
...
Despite it is not used for network management, it is
very convenient tool for wifi bringup and debugging.
Test: Manual
Change-Id: I045301acc2dd15d0e68d6b99c8e214865f19ebad
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2017-05-16 14:24:18 -07:00
Elliott Hughes
97caf43fbc
Merge "Remove libbase's trivial libutils-headers dependency." am: 337b4dd661
...
am: 70b0e94f80
2017-05-16 18:02:36 +00:00
Elliott Hughes
70b0e94f80
Merge "Remove libbase's trivial libutils-headers dependency."
...
am: 337b4dd661
2017-05-16 17:59:06 +00:00
Treehugger Robot
337b4dd661
Merge "Remove libbase's trivial libutils-headers dependency."
2017-05-16 17:51:14 +00:00
Mark Salyzyn
8ab4f5eafc
Merge "logd: remove start filtration from flushTo" am: c8c49988b1
...
am: 27d54dd4ac
2017-05-16 15:24:23 +00:00
Mark Salyzyn
27d54dd4ac
Merge "logd: remove start filtration from flushTo"
...
am: c8c49988b1
2017-05-16 15:21:23 +00:00
Treehugger Robot
c8c49988b1
Merge "logd: remove start filtration from flushTo"
2017-05-16 15:11:34 +00:00
Bowgo Tsai
c7690e0abe
Merge "fs_mgr: support different dm-verity error modes" am: b9b95ee3a9
...
am: d1a2aac294
2017-05-16 01:12:31 +00:00
Bowgo Tsai
d1a2aac294
Merge "fs_mgr: support different dm-verity error modes"
...
am: b9b95ee3a9
2017-05-16 01:09:30 +00:00
Treehugger Robot
b9b95ee3a9
Merge "fs_mgr: support different dm-verity error modes"
2017-05-16 01:04:34 +00:00
Elliott Hughes
282ec458be
Remove libbase's trivial libutils-headers dependency.
...
Bug: N/A
Test: builds
Change-Id: I59eb464a0127564a42775bf19b516ad8a53ee235
2017-05-15 17:31:15 -07:00
Elliott Hughes
1eec97af07
Fix "fastboot flashing".
...
...without breaking "fastboot oem". Turns out the bootloader actually needs
to know whether it's getting a "flashing" or "oem" command.
Bug: http://b/38321935
Test: "fastboot flashing unlock" "fastboot oem uart enable"
Change-Id: I2b3c0b42b01e3c884aa794fa273034a366985089
2017-05-15 16:53:53 -07:00
Mark Salyzyn
6b05d269a3
Merge "logcat: -v thread help missing" am: 3cfc1ab89d
...
am: 6f9051ea1b
2017-05-15 23:00:21 +00:00
Mark Salyzyn
6f9051ea1b
Merge "logcat: -v thread help missing"
...
am: 3cfc1ab89d
2017-05-15 22:57:50 +00:00
Treehugger Robot
3cfc1ab89d
Merge "logcat: -v thread help missing"
2017-05-15 22:52:29 +00:00
Mark Salyzyn
982ad208b5
logd: remove start filtration from flushTo
...
We have already searched for the start point, the start filter check
is paranoia that removes out-of-order entries that we are undoubtably
interested in. Out-of-order entries occur under reader pressure, as
the writer gets pushed back from in-place sorted order and lands it
at the end for the reader to pick it up. If this occurred during a
batch run or a logger thread wakeup, the entry could be filtered out
and never output to the reader.
Found one case where logcat.tail_time* tests failed which was fixed
with this adjustment.
Test: gTest logd-unit-tests, liblog-unit-tests and logcat-unit-tests
Bug: 38046067
Bug: 37791296
Change-Id: Icbde6b33dca7ab98348c3a872793aeef3997d460
2017-05-15 15:13:20 -07:00
Josh Gao
f4578f1ad4
Merge changes I8e8e0963,I3c714f63,Id157412e,Ib7c26fbd am: 55ddb99527
...
am: 66ca192ac3
2017-05-15 20:58:18 +00:00
