Commit Graph

59638 Commits

Author SHA1 Message Date
Tom Cherry 57c8eacee4 liblog: support extended logger_entry headers
logger_entry has a hdr_size field meant for backwards compatibility,
however there are a few checks that expect it to be a specific size.
More problematically, it has a variable length array element, msg[0]
at the end, that would be incorrect if the header size was not kept
static.

This change fixes up those issues to facilitate future additions.

Bug: 119867234
Test: logging works with extended size headers, logging unit tests
Test: newly added unit tests with extended size header
Merged-In: I14b2b0855d219d11f374b53a5aa8e05cd6a65eef
Change-Id: I14b2b0855d219d11f374b53a5aa8e05cd6a65eef
(cherry picked from commit d3ecc66b9c)
2020-04-10 11:48:06 -07:00
Yifan Hong 7cc7a54abc BatteryMonitor: report current_now in uA
/sys/class/power_supply/*/current_now should return uA and the HAL
expects uA too.

Test: VtsHalHealthV2_0TargetTest
Bug: 136717180
Change-Id: I675be1ae645413b9494af4a5d49955aad5bd4f2e
(cherry picked from commit e5bd5f914f)
Merged-In: I675be1ae645413b9494af4a5d49955aad5bd4f2e
2020-04-09 14:41:51 -07:00
android-build-team Robot 83141cddfc Snap for 6379507 from f58042d0f7 to mainline-release
Change-Id: I0b18bc1ad70c33d2b71c0fa7954e85cf8fb64dd9
2020-04-09 07:12:46 +00:00
Steve Muckle f58042d0f7 first_stage_init: load modules in modules.load.recovery in recovery am: ae317c716b am: 5fd7b47046 am: 0df946ff26
Change-Id: If1d7b896541d979d0be73d501e6badc5e323301e
2020-04-08 20:53:58 +00:00
Steve Muckle 0df946ff26 first_stage_init: load modules in modules.load.recovery in recovery am: ae317c716b am: 5fd7b47046
Change-Id: Ib76cb288313b56cda5d585a692f116b22914ee8f
2020-04-08 20:43:12 +00:00
Steve Muckle 5fd7b47046 first_stage_init: load modules in modules.load.recovery in recovery am: ae317c716b
Change-Id: Ib4beb262e2797ddb5d147668744c6a548b01f306
2020-04-08 20:31:06 +00:00
Steve Muckle ae317c716b first_stage_init: load modules in modules.load.recovery in recovery
In recovery mode, load modules from modules.load.recovery if it
exists. Otherwise load from modules.load as usual.

Bug: 150825361
Change-Id: I7636bb5958ed10ae9a66015f04f168129618272f
Merged-In: I7636bb5958ed10ae9a66015f04f168129618272f
2020-04-08 10:49:13 -07:00
android-build-team Robot 2a130a3a11 Snap for 6374617 from e3dab2beb2 to mainline-release
Change-Id: I8e0f1e061663affa6cb4cef87b41d8fcd4fd4b53
2020-04-08 07:14:21 +00:00
Tej Singh 2a067a46fc Merge "Link libc++ statically" into rvc-dev am: 282afacd3a am: bf993dd95c am: a618183d59
Change-Id: I818b41bed439208d7b9824abd58b683d93b9c69d
2020-04-08 01:24:33 +00:00
Tej Singh a618183d59 Merge "Link libc++ statically" into rvc-dev am: 282afacd3a am: bf993dd95c
Change-Id: I9a54171d17167198db2a607904b45acdf86035f4
2020-04-08 01:08:54 +00:00
Tej Singh bf993dd95c Merge "Link libc++ statically" into rvc-dev am: 282afacd3a
Change-Id: Ifd607d68ff275709345868e6880587650854000d
2020-04-08 00:51:39 +00:00
TreeHugger Robot 2dfce3fc62 Merge "Abolish DmTargetDefaultKey::IsLegacy" into rvc-dev am: 1dc77eaa61 am: d8ff3cde88 am: 2a12cfcba9
Change-Id: Id48d459f0db59aab64cc4e276673b52131294b68
2020-04-08 00:49:00 +00:00
Tej Singh 282afacd3a Merge "Link libc++ statically" into rvc-dev 2020-04-08 00:37:49 +00:00
TreeHugger Robot 2a12cfcba9 Merge "Abolish DmTargetDefaultKey::IsLegacy" into rvc-dev am: 1dc77eaa61 am: d8ff3cde88
Change-Id: I2c580a5bca1de0cf76333565518613bc8d00506d
2020-04-08 00:37:28 +00:00
TreeHugger Robot d8ff3cde88 Merge "Abolish DmTargetDefaultKey::IsLegacy" into rvc-dev am: 1dc77eaa61
Change-Id: Ic6d39574029245b5cb242d881753e40ca80511f3
2020-04-08 00:24:40 +00:00
TreeHugger Robot 1dc77eaa61 Merge "Abolish DmTargetDefaultKey::IsLegacy" into rvc-dev 2020-04-08 00:10:58 +00:00
Will Mcvicker e3dab2beb2 Merge "first_stage_init: increase serial console tries to 50" into rvc-dev am: 51ae53fa1c am: c7aa8120a4 am: 6525839c20
Change-Id: I43b880a9ccad233bb7ea02d05ddd25dfcc4378b1
2020-04-07 21:14:33 +00:00
Nikita Ioffe b28410e98a Manually unmount /data_mirror mounts in the right order am: a680e261e6 am: 8166b75d37 am: 5fdfa49046
Change-Id: Ifccd772e84feacb5094c1c1fade03b4957533f38
2020-04-07 21:14:13 +00:00
Will Mcvicker 6525839c20 Merge "first_stage_init: increase serial console tries to 50" into rvc-dev am: 51ae53fa1c am: c7aa8120a4
Change-Id: I42202f606534f8dbac6dc841758a4079ec643d20
2020-04-07 21:02:15 +00:00
Will Mcvicker c7aa8120a4 Merge "first_stage_init: increase serial console tries to 50" into rvc-dev am: 51ae53fa1c
Change-Id: I9d31c395f8c34c6f26f2ec50146c3574d1f1f481
2020-04-07 21:01:55 +00:00
Nikita Ioffe 5fdfa49046 Manually unmount /data_mirror mounts in the right order am: a680e261e6 am: 8166b75d37
Change-Id: Ib3fb83c3d89d4d34e34fe333750e3a91383cad63
2020-04-07 21:00:58 +00:00
Will Mcvicker 51ae53fa1c Merge "first_stage_init: increase serial console tries to 50" into rvc-dev 2020-04-07 20:24:02 +00:00
Nikita Ioffe 8166b75d37 Manually unmount /data_mirror mounts in the right order am: a680e261e6
Change-Id: Ia3554e41e865233e1e93ee8fcb4b94f92ee72565
2020-04-07 20:11:11 +00:00
Nikita Ioffe a680e261e6 Manually unmount /data_mirror mounts in the right order
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 152823078
Change-Id: I57ff9182807630d8cbcf3ca6374fdd6dc6379da5
Merged-In: I57ff9182807630d8cbcf3ca6374fdd6dc6379da5
(cherry picked from commit bf66f433d6)
2020-04-07 18:54:48 +01:00
Nikita Ioffe 317de3aab2 get_mounted_entry_for_userdata: Realpath block devices from fstabs am: 7facdac6af am: a910b8b83f am: 6728c7f00c
Change-Id: I5ddd877c18df12909b9ce660608fa0f2b24ea818
2020-04-07 17:02:33 +00:00
Nikita Ioffe 6728c7f00c get_mounted_entry_for_userdata: Realpath block devices from fstabs am: 7facdac6af am: a910b8b83f
Change-Id: Ib94fc220a5e860ea4bb8f9bd828071e40bc6d4c8
2020-04-07 16:49:30 +00:00
Nikita Ioffe a910b8b83f get_mounted_entry_for_userdata: Realpath block devices from fstabs am: 7facdac6af
Change-Id: I6ea563c6272e6428be510074a00ead63eba20086
2020-04-07 16:35:18 +00:00
Paul Crowley c9c9d1288f Abolish DmTargetDefaultKey::IsLegacy
To make it easier to support disk formats created using old versions
of dm-default-key with new kernels, stop checking the kernel module
version; instead, the caller decides whether to use the old or new
options format.

Bug: 150761030
Test: crosshatch and cuttlefish boot normally; cuttlefish
    fails with "default-key: Not enough arguments" as expected when
    option is set to 1
Cherry-Picked-From: 539b98fb58
Merged-In: I810bb7e085b9b8648858de1a02165162d1fd163e
Change-Id: I810bb7e085b9b8648858de1a02165162d1fd163e
2020-04-07 07:33:05 -07:00
Nikita Ioffe 7facdac6af get_mounted_entry_for_userdata: Realpath block devices from fstabs
Use realpath as a canonical representation of block devices. This makes
it easier to reason about block devices. This also fixes a bug, in which
fs_mgr_get_mounted_entry_for_userdata didn't properly work on devices
that don't support metadata encryption.

Test: atest CtsFsMgrTestCases
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 153363818
Change-Id: I139c2be46336a632bbaee86667019c075d7de814
Merged-In: I139c2be46336a632bbaee86667019c075d7de814
(cherry picked from commit 7aa37f1f21)
2020-04-07 14:04:06 +01:00
Josh Gao 6bf1fb51a6 Merge "Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""" into rvc-dev am: 60375b7cc6 am: 57169537c1 am: 83e58a82be
Change-Id: I355fa2a92a4b163eaf481c933c3abbb7583805cd
2020-04-07 11:46:03 +00:00
Josh Gao 83e58a82be Merge "Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""" into rvc-dev am: 60375b7cc6 am: 57169537c1
Change-Id: Ida2214f0838318a6b98d4492abc07aa958c283b8
2020-04-07 11:33:35 +00:00
Josh Gao 57169537c1 Merge "Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""" into rvc-dev am: 60375b7cc6
Change-Id: I5d42da9d5a9143f3ca0b38ab8a4f374f6a1e80be
2020-04-07 11:19:24 +00:00
Josh Gao 60375b7cc6 Merge "Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""" into rvc-dev 2020-04-07 11:08:07 +00:00
android-build-team Robot 4cecfd4d63 Snap for 6371019 from 2cf45ed403 to mainline-release
Change-Id: I7424474ed6691aee89be6a8cdb927ad4305cb46a
2020-04-07 07:08:57 +00:00
Dan Shi 2cf45ed403 Merge "Rename vts-core to vts" into rvc-dev am: 783db0d261 am: 3af4fd423e am: b2b5bdb92a
Change-Id: I5862f5acf60311977372f2f1673315a7d81aa638
2020-04-07 03:57:30 +00:00
Dan Shi b2b5bdb92a Merge "Rename vts-core to vts" into rvc-dev am: 783db0d261 am: 3af4fd423e
Change-Id: Ice2367a1c2f7652523b0c71cda59a8615a02aaad
2020-04-07 03:38:11 +00:00
Dan Shi 3af4fd423e Merge "Rename vts-core to vts" into rvc-dev am: 783db0d261
Change-Id: I38bd88512048df40f8b68f4ecb05ab5fe178fddd
2020-04-07 03:18:03 +00:00
Tej Singh 5d8f770b1c Link libc++ statically
Test: bit statsd_test:*
Test: bit libstatssocket_test:*
Test: bit libstatspull_test:*
Bug: 153349659
Change-Id: Ief3d0e062ed3e5cabf5b8b6198510caf3f64eefd
2020-04-06 19:52:03 -07:00
Dan Shi 783db0d261 Merge "Rename vts-core to vts" into rvc-dev 2020-04-07 02:48:30 +00:00
TreeHugger Robot 3af2154bc6 Merge "Remove vts10 tests from vts suite" into rvc-dev am: ffe8c3a110 am: f557cfb193 am: f39c7ec02a
Change-Id: I625f49582b38ea7aa2e643caddd6dad0cd671b7c
2020-04-07 01:19:42 +00:00
TreeHugger Robot f39c7ec02a Merge "Remove vts10 tests from vts suite" into rvc-dev am: ffe8c3a110 am: f557cfb193
Change-Id: I3c50f316f377a7c9a720491ae004be55913cee46
2020-04-07 00:57:36 +00:00
TreeHugger Robot f557cfb193 Merge "Remove vts10 tests from vts suite" into rvc-dev am: ffe8c3a110
Change-Id: I6385ce409001bc08c8cba9a62287fa498dcb0c50
2020-04-07 00:34:36 +00:00
TreeHugger Robot ffe8c3a110 Merge "Remove vts10 tests from vts suite" into rvc-dev 2020-04-07 00:19:39 +00:00
Josh Gao b3b43be658 Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""
This reverts commit d9684d5943.

This seems to be correlated with an increase in the rate of devices
going offline. Revert it to see if failure rates improve.

Bug: http://b/150863651
Test: treehugger
Change-Id: Ia6163fd9e31d2bf812628e028249662594ac2024
2020-04-06 16:48:35 -07:00
Dan Shi a7b9a2bfd2 Rename vts-core to vts
Bug: 151896491
Test: presubmit check
Exempt-From-Owner-Approval: This CL renames suite name vts-core to vts.
It won't change test logic or behavior.

Change-Id: I24779951257ce37fc18929f214d3cf5f76c23a19
2020-04-06 16:11:29 -07:00
Nikita Ioffe d397dd4fe5 Merge "Improve logging in bootstat." into rvc-dev am: 04e3790dbf am: 7f6fb8c9b5 am: d6cf3e0a2f
Change-Id: I4f5dc3674f0032e2e578ac49e0de455ed9129af0
2020-04-06 21:51:17 +00:00
Nikita Ioffe d6cf3e0a2f Merge "Improve logging in bootstat." into rvc-dev am: 04e3790dbf am: 7f6fb8c9b5
Change-Id: I1cf02b4b215b4b69e602e883a7b862b14fe273fc
2020-04-06 21:32:58 +00:00
Dan Shi 12c7aa8ace Remove vts10 tests from vts suite
The tests are only needed in vts10 suite, as they are part of CTS
package and no longer needed in vts 11.

Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL removes vts10 tests from vts suite.
It won't change test logic or behavior.

Change-Id: I4d468be075b54213b56c7e1aa94af94f2bdce9ff
Merged-In: I4d468be075b54213b56c7e1aa94af94f2bdce9ff
2020-04-06 14:25:10 -07:00
Nikita Ioffe 7f6fb8c9b5 Merge "Improve logging in bootstat." into rvc-dev am: 04e3790dbf
Change-Id: Ib2232bc8fb1a0ca948cf37a8f64cb2c0c74c152f
2020-04-06 21:12:54 +00:00
Nikita Ioffe 04e3790dbf Merge "Improve logging in bootstat." into rvc-dev 2020-04-06 20:56:12 +00:00