Commit graph

29673 commits

Author SHA1 Message Date
David Zeuthen
2b3a568171 Merge "adb: Support 'adb enable/disable-verity' when using AVB."
am: 8fc6cc8910

Change-Id: I00ac80a2b878525a543e5fe080a9c5b147b0b141
2017-05-02 15:29:57 +00:00
Treehugger Robot
8fc6cc8910 Merge "adb: Support 'adb enable/disable-verity' when using AVB." 2017-05-02 15:24:25 +00:00
David Zeuthen
1e033d6804 adb: Support 'adb enable/disable-verity' when using AVB.
Link with libavb_user and use this to enable/disable dm-verity if AVB
is in use.

Bug: 34124301
Test: Manually tested.
Change-Id: Ic03651312b955081cb3c126f6dafc46d6eeec0da
2017-05-02 09:39:55 -04:00
David Zeuthen
983d542d49 Merge "fs_mgr: Clear AvbOps struct."
am: 6ea4f213d8

Change-Id: Ie0e7ff7f1c2c0640912f10d4384f048a49820bea
2017-05-02 13:39:20 +00:00
Treehugger Robot
6ea4f213d8 Merge "fs_mgr: Clear AvbOps struct." 2017-05-02 13:35:58 +00:00
Elliott Hughes
68c9642a9d Merge "Stop writing NUL bytes in adbkey.pub."
am: d340c1ebbe

Change-Id: Ia0980152cdd937c440aa42c36577670d1e853eea
2017-05-02 00:55:01 +00:00
Chenjie Luo
c955d890de Merge "Modularize logd."
am: ab28acef76

Change-Id: I4d60aa75895a335c9e79f9e069da1d8c873d74a5
2017-05-02 00:53:08 +00:00
Treehugger Robot
d340c1ebbe Merge "Stop writing NUL bytes in adbkey.pub." 2017-05-02 00:51:48 +00:00
Chenjie Luo
ab28acef76 Merge "Modularize logd." 2017-05-02 00:44:47 +00:00
Tom Cherry
e2865c0f54 Merge "init: add an initializer for keychord_id_"
am: 7c3f147070

Change-Id: I4fd25f216591ad19be6670be79a485995e377b19
2017-05-02 00:33:59 +00:00
Tom Cherry
7c3f147070 Merge "init: add an initializer for keychord_id_" 2017-05-02 00:30:17 +00:00
Elliott Hughes
0b771b33fd Stop writing NUL bytes in adbkey.pub.
In N we moved some code from C to C++ without realizing that EVP_EncodedLength
includes space for a terminating NUL and EVP_EncodeBlock writes one. Because
our key reading code copes with the NUL, we never noticed.

Distinguish between the required space returned by EVP_EncodedLength and the
actual number of bytes (not including NUL) used return by EVP_EncodeBlock.

Bug: http://b/36187819
Test: hexdump of ~/.android/adbkey.pub
Change-Id: I81a487ddbb5c884593b6426d1f41cfaece26ff90
2017-05-01 16:05:16 -07:00
Tom Cherry
c2c8f5e0dc Merge "ueventd: remove leftovers of the SELinux policy update mechanism"
am: 6a8314c8bf

Change-Id: I14053438d05ae8f9be8ddf7e4444c542706a974c
2017-05-01 22:55:22 +00:00
Tom Cherry
6a8314c8bf Merge "ueventd: remove leftovers of the SELinux policy update mechanism" 2017-05-01 22:48:29 +00:00
Tom Cherry
4be091d588 Merge "ueventd: fix typo from previous patchset"
am: c8877530c7

Change-Id: I57d29ff6df9cd02a2b48d218a1492bde0e7d408d
2017-05-01 22:46:21 +00:00
Tom Cherry
c8877530c7 Merge "ueventd: fix typo from previous patchset" 2017-05-01 22:36:12 +00:00
Tom Cherry
7da548578c init: add an initializer for keychord_id_
Add unit test to ensure all POD types of Service are initialized.

Bug: 37855222
Test: Ensure bugreport is triggered via keychord properly.
Test: New unit tests
Change-Id: If2cfea15a74ab417a7b909a60c264cb8eb990de7
2017-05-01 15:35:07 -07:00
Josh Gao
bcca79c4f6 Merge "base: remove execute bit from utf8.cpp, utf8_test.cpp."
am: 1879c00e64

Change-Id: Ia213b1e6f2870d63ee217f603ab531245f925b68
2017-05-01 22:05:43 +00:00
Josh Gao
67cfaf4b9a Merge "Revert "base: make boot_clock work on host linux, hide it on non-linux.""
am: dd3667059b

Change-Id: I82fbe0d20965fa9bb8d3b7c856bf12f7268850d4
2017-05-01 22:05:19 +00:00
Treehugger Robot
1879c00e64 Merge "base: remove execute bit from utf8.cpp, utf8_test.cpp." 2017-05-01 21:57:28 +00:00
Josh Gao
dd3667059b Merge "Revert "base: make boot_clock work on host linux, hide it on non-linux."" 2017-05-01 21:57:14 +00:00
Josh Gao
0b35b18f88 Revert "base: make boot_clock work on host linux, hide it on non-linux."
This reverts commit ae29339ca1, which broke the darwin build.

Change-Id: Ib33e2dab197532f04944cb12151002e9219b1bb5
2017-05-01 21:56:28 +00:00
Mark Salyzyn
2eecd3ab99 Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate"
am: 43e9106410

Change-Id: I587999f0716b84ca9e1c8445be109dcefa037976
2017-05-01 21:14:34 +00:00
Treehugger Robot
43e9106410 Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" 2017-05-01 21:01:58 +00:00
Elliott Hughes
893a3c4468 Merge "Simplify "adb sync" documentation."
am: 05eed13247

Change-Id: I26034f7cb7bc005ed5ea631f35a6c762579ddedc
2017-05-01 20:57:38 +00:00
Josh Gao
2eef9831b7 Merge "base: make boot_clock work on host linux, hide it on non-linux."
am: eaad4e28e8

Change-Id: I32289827cf5e3506df6d77f4048377f4e4d41875
2017-05-01 20:57:16 +00:00
Elliott Hughes
05eed13247 Merge "Simplify "adb sync" documentation." 2017-05-01 20:51:43 +00:00
Josh Gao
eaad4e28e8 Merge "base: make boot_clock work on host linux, hide it on non-linux." 2017-05-01 20:49:50 +00:00
Erik Staats
fc6d71707a Merge "Change set_sched_policy to set slack for current thread."
am: d6f8b5f2d4

Change-Id: Ie4f9953e7ef30f144f9871a9710c2cc13065a332
2017-05-01 18:45:50 +00:00
Erik Staats
d6f8b5f2d4 Merge "Change set_sched_policy to set slack for current thread." 2017-05-01 18:35:30 +00:00
Elliott Hughes
0754cb929c Simplify "adb sync" documentation.
Remove -p (which only applied to "adb sync"), explicitly mention
$ANDROID_PRODUCT_OUT in the "adb sync" help text, and add "adb sync all"
as a synonym for "adb sync" for ease of documentation.

Bug: http://b/33761074
Test: "adb sync" still works, "adb --help" looks good
Change-Id: Ie5b2459a7e5e4140298f78815be25fa7c7bb47d0
2017-05-01 11:04:31 -07:00
Tom Cherry
f51c66b23b ueventd: fix typo from previous patchset
An forward declaration for a function that was removed in later
patchsets was merged anyway.  Since it's not used anywhere, this CL
removes it.

Test: build bullhead
Change-Id: Ie7223f7d23305b71438cb063b64a574ce32f96bb
2017-05-01 10:53:39 -07:00
Tom Cherry
6daf514448 ueventd: remove leftovers of the SELinux policy update mechanism
Reloading sepolicy has been removed from the system, so this support
code can also now be removed.

Bug: 26544104
Test: Boot bullhead
Change-Id: If9dbc9d540d9a69340c1dd6a483c1f8fe5feb287
2017-05-01 10:39:03 -07:00
David Zeuthen
16c6fd1da7 fs_mgr: Clear AvbOps struct.
This ensures that future operations (e.g. function pointers in the
AvbOps struct) added to AvbOps are set to NULL.

Bug: 37709309
Test: Manually tested on UEFI-based bootloader.
Change-Id: If83ea57b7abad94e472768c594efa210e3351a4d
2017-05-01 13:25:20 -04:00
Mark Salyzyn
fddaec1e2c Merge "logd: CTS test"
am: 16214f2955

Change-Id: I77ca1c3fa6a5fa7569cc433bc419bebf5c5334ff
2017-05-01 16:58:28 +00:00
Treehugger Robot
16214f2955 Merge "logd: CTS test" 2017-05-01 16:50:50 +00:00
Steven Moreland
685b39d53b Merge "liblog: __android_log_error_write in vndk"
am: ae10af6050

Change-Id: If60bc2c69d62b3336a841e882d0e088cdd869ea9
2017-05-01 16:28:56 +00:00
Treehugger Robot
ae10af6050 Merge "liblog: __android_log_error_write in vndk" 2017-05-01 16:23:39 +00:00
Mark Salyzyn
f0b53d0726 libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate
Cover both direct and symlink indirect paths to the referenced
files in the vendor, odm and oem partitions.

Test: compile and hand-verify properties
Bug: 37703469
Change-Id: I5b3a887e904baee2ac193ac4a73aaaee0bbfdb9f
2017-05-01 16:17:31 +00:00
Steven Moreland
64328403b5 liblog: __android_log_error_write in vndk
Also added log_safetynet.h header. This contains a memory sensitive logging
function which is used to detect attack attempts.

Fixes: 37442967
Test: liblog-unit-tests on internal marlin
Test: build liblog with BOARD_VNDK_VERSION := current on aosp_arm
Test: libbinder vendor variant links with BOARD_VNDK_VERSION := current

Change-Id: Icfcc2b1acbb3712bf4c84403870dc93401eafb15
2017-05-01 14:40:55 +00:00
Elliott Hughes
024a51bdc8 Merge "Remove unused cruft from <cutils/bitops.h>."
am: 4c8acafa25

Change-Id: I3c40f329d682da8c2ec89018add35b0a64076f43
2017-04-30 02:48:29 +00:00
Elliott Hughes
4c8acafa25 Merge "Remove unused cruft from <cutils/bitops.h>." 2017-04-30 02:45:46 +00:00
Elliott Hughes
0e8810ccbe Remove unused cruft from <cutils/bitops.h>.
Bug: N/A
Test: builds
Change-Id: I5931f2b91b2d64d8e26f9ba092879c14d0ed3622
2017-04-29 10:22:40 -07:00
Steven Moreland
4cceba71fd Merge "lmkd: Android.mk -> Android.bp"
am: 6de56724a2

Change-Id: I495889f50101bb0eac1fc3435d50bd2b667799a0
2017-04-29 08:19:48 +00:00
Treehugger Robot
6de56724a2 Merge "lmkd: Android.mk -> Android.bp" 2017-04-29 08:14:21 +00:00
Bowgo Tsai
0bb2ebbe74 Merge "fs_mgr: code clean up"
am: 0914d2bdff

Change-Id: Iebda2fb1cf9aa4e70d4c8160ff42ff45300c8c40
2017-04-29 03:29:29 +00:00
Treehugger Robot
0914d2bdff Merge "fs_mgr: code clean up" 2017-04-29 03:21:33 +00:00
Chenjie Luo
fafea32468 Modularize logd.
Separates logd body into a static library liblogd and
virtualize LogBuffer::log to be in a new interface class
LogBufferInterface. User could have different implementation.

Bug: 37756450
Test: liblog-unit-tests, logd-unit-tests and logcat-unit-tests
with (b/37791296).
Change-Id: I1504ff0e992744001b5a2e9abd45692d1318a152
2017-04-28 17:30:25 -07:00
Steven Moreland
1457c9290d lmkd: Android.mk -> Android.bp
Test: links
Change-Id: I19aa62270488af02d64830ca90faf80b35423009
2017-04-28 15:20:18 -07:00
Mark Salyzyn
2bd06f2895 logd: CTS test
Utilize logd-unit-tests as a CTS test

Goal is to check if the kernel logger is enabled.

Test: run cts tests
Bug: 31772697
Change-Id: I6d80350f3e40aff095f81b6600c40dd7d376bd74
2017-04-28 13:50:56 -07:00