Commit graph

56085 commits

Author SHA1 Message Date
Automerger Merge Worker
4da6dfbc69 Merge "InitFatalReboot: Panic the system if init_fatal_panic is "true"" am: d377ad8b06 am: 2af792be76
Change-Id: Icdf09dec5e445bc0ff8d7d302ee6f309518f210b
2020-01-09 02:26:13 +00:00
Woody Lin
2af792be76 Merge "InitFatalReboot: Panic the system if init_fatal_panic is "true""
am: d377ad8b06

Change-Id: I0c7dd0272adeaa0d85f3d2d7064e75e7381a777e
2020-01-08 18:13:24 -08:00
Woody Lin
d377ad8b06 Merge "InitFatalReboot: Panic the system if init_fatal_panic is "true"" 2020-01-09 02:11:52 +00:00
Tom Cherry
b47aa2a592 liblog: remove more unused code
Cleanup the headers; we really don't want to encourage any more
cutils/list.h usage...

Remove __android_log_uid() since the only remaining users are built
for device, so they can just use getuid() directly.

Test: build
Change-Id: I62be2c1e43d83807deaa9342afcc72459947cf15
2020-01-08 17:11:09 -08:00
Tom Cherry
21bb36c66a liblog: remove the last of the transport structs
Test: build, liblog unit tests
Change-Id: I292662fc64e3163b570c5daeaa8f912fb6ca74e8
2020-01-08 17:11:06 -08:00
Automerger Merge Worker
88bc63946a Merge "adb: avoid consuming input in adb remount." am: 97186600b5 am: 955738001d
Change-Id: I5c9acf31993f2039ac2848927beef4c19f8f6d3b
2020-01-09 00:33:18 +00:00
Josh Gao
955738001d Merge "adb: avoid consuming input in adb remount."
am: 97186600b5

Change-Id: I6e8bcaedb345928fcfc4e062d28b89fb8c46eb2b
2020-01-08 16:17:12 -08:00
Treehugger Robot
97186600b5 Merge "adb: avoid consuming input in adb remount." 2020-01-08 23:52:40 +00:00
Automerger Merge Worker
7bcdc7d4af Merge "SnapshotManager expose no space error" am: 3be1310cf8 am: 5cf2d3ecc0
Change-Id: I23a18a71a5bc9867c0ac8fd3038a6fb3ec9de95a
2020-01-08 22:43:29 +00:00
Automerger Merge Worker
20c23f681f Merge "SurfaceFlinger: migrate capabilities to surfaceflinger.rc" am: 1f3e40e8e7 am: f0b712654a
Change-Id: I278da0f396b3e422e9b859fca52a50c2550d4e76
2020-01-08 22:40:53 +00:00
Yifan Hong
5cf2d3ecc0 Merge "SnapshotManager expose no space error"
am: 3be1310cf8

Change-Id: I0ddf4aa1baca81757f313d3cddaa11862875dfc6
2020-01-08 14:08:31 -08:00
Ady Abraham
f0b712654a Merge "SurfaceFlinger: migrate capabilities to surfaceflinger.rc"
am: 1f3e40e8e7

Change-Id: I27a56b089cdac1486983fff1d1ad8e2e0152defa
2020-01-08 14:05:59 -08:00
Treehugger Robot
3be1310cf8 Merge "SnapshotManager expose no space error" 2020-01-08 21:36:43 +00:00
Treehugger Robot
1f3e40e8e7 Merge "SurfaceFlinger: migrate capabilities to surfaceflinger.rc" 2020-01-08 21:18:44 +00:00
Josh Gao
9e75634082 adb: avoid consuming input in adb remount.
Bug: https://issuetracker.google.com/146163747
Test: dd if=/dev/zero bs=1024 count=1 | (adb remount; wc)
Change-Id: I700090cd0bbae2d76569008f3c1a116336951c0a
2020-01-08 12:43:34 -08:00
Ady Abraham
21844fa771 SurfaceFlinger: migrate capabilities to surfaceflinger.rc
SurfaceFlinger requires CAP_SYS_NICE which is set in
libcutils/fs_config.cpp. This is the old way of setting capabilities
and new the way is to set it directly on surfaceflnger.rc

Test: adb shell /data/nativetest64/SurfaceFlinger_test/SurfaceFlinger_test
Test: adb shell stop surfaceflinger && adb shell start surfaceflinger
Bug: 147271477
Change-Id: I680509a385928a9c929d4fe4857118af219e2b13
2020-01-08 19:35:57 +00:00
Automerger Merge Worker
71dfea44f3 Merge "DO NOT MERGE - Merge January 2020 Security Release into master" am: 3b79cfb72d am: 54e69f89c9
Change-Id: I3631414dbfe50fe5145b0bf96cbbc5b8ed78c6b4
2020-01-08 18:18:03 +00:00
Xin Li
54e69f89c9 Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
am: 3b79cfb72d

Change-Id: I252631c788fa1c586afe3704cdf5101a513aba7a
2020-01-08 10:11:26 -08:00
Automerger Merge Worker
542fc0ba3b DO NOT MERGE - Merge January 2020 Security Release into master am: ccf87b69d5 am: 724b6f63bf
Change-Id: I9d6567a2278f8940922949603bd1d9abd81e11c0
2020-01-08 18:08:50 +00:00
Automerger Merge Worker
92e61f344d Merge "init: Fix writing "reboot recovery" to BCB" am: a4b446d766 am: fb06eac118
Change-Id: Ie08572fb94b5d436eb52d376de16fb0686c1f351
2020-01-08 18:08:29 +00:00
Elliott Hughes
65474fd78c adb: fix adb connect help typo.
Bug: http://b/130380645
Test: adb connect
Change-Id: I04205ff0120bcfd865dc5fa95846694d0ff6de80
2020-01-08 10:02:43 -08:00
Xin Li
724b6f63bf DO NOT MERGE - Merge January 2020 Security Release into master
am: ccf87b69d5

Change-Id: I30bf4ba5e974c9b22fe9f30861c930d25cfab7e4
2020-01-08 09:47:48 -08:00
Tom Cherry
fb06eac118 Merge "init: Fix writing "reboot recovery" to BCB"
am: a4b446d766

Change-Id: Ida33a676a34831bd6d9950f76edb5ca74f2824ad
2020-01-08 09:47:21 -08:00
Xin Li
3b79cfb72d Merge "DO NOT MERGE - Merge January 2020 Security Release into master" 2020-01-08 17:39:17 +00:00
Tom Cherry
a4b446d766 Merge "init: Fix writing "reboot recovery" to BCB" 2020-01-08 17:15:08 +00:00
Woody Lin
6bbfa26813 InitFatalReboot: Panic the system if init_fatal_panic is "true"
While handling the fatal signals and abort, exits from the signal
handler to panic the system if "androidboot.init_fatal_panic" in cmdline
is configured as "true".

Bug: 146818493
Change-Id: I59fffb7598ce981383ae24961a97fd2fd8e8d64e
2020-01-08 11:43:51 +08:00
Automerger Merge Worker
d9884baf7b Merge "ImageManager returns FiemapStatus." am: 70768af0fe am: d11a4aba6e
Change-Id: Ic9a9eddd895d73c534d47ab820578dd7114196c6
2020-01-08 03:38:27 +00:00
Yifan Hong
d11a4aba6e Merge "ImageManager returns FiemapStatus."
am: 70768af0fe

Change-Id: Ibfdf51d231c7f2501584f0afc69487381abe5c42
2020-01-07 19:23:01 -08:00
Yifan Hong
70768af0fe Merge "ImageManager returns FiemapStatus." 2020-01-08 02:57:37 +00:00
Automerger Merge Worker
49cc77915a Merge "libfiemap: Create/Open returns FiemapStatus" am: 0ed21b604c am: 162e020d0a
Change-Id: I74e7468292d4421944128f6dca219ce5a4f8f4ce
2020-01-08 01:26:33 +00:00
Yifan Hong
162e020d0a Merge "libfiemap: Create/Open returns FiemapStatus"
am: 0ed21b604c

Change-Id: Ibdff6906573e4863d7eab808ad217db4370b9f5e
2020-01-07 17:12:50 -08:00
Yifan Hong
0ed21b604c Merge "libfiemap: Create/Open returns FiemapStatus" 2020-01-08 01:00:43 +00:00
Automerger Merge Worker
43d554bb66 Merge "Support AVB chain partitions for HASH descriptors" am: 4d82b283dd am: 7755c46a09
Change-Id: I39c8170efa90e50f63033f09bba68d5d97540e28
2020-01-08 00:38:14 +00:00
Bowgo Tsai
7755c46a09 Merge "Support AVB chain partitions for HASH descriptors"
am: 4d82b283dd

Change-Id: I697a3b29676f5da194b3c9518187fdddd7482d38
2020-01-07 16:21:16 -08:00
Treehugger Robot
4d82b283dd Merge "Support AVB chain partitions for HASH descriptors" 2020-01-08 00:16:20 +00:00
Xin Li
ccf87b69d5 DO NOT MERGE - Merge January 2020 Security Release into master
Bug: 147314974
Change-Id: Ia77f51c0996b4840fcb49376f35ea17f0b1fdf48
2020-01-07 15:25:26 -08:00
Yifan Hong
cd232f9734 SnapshotManager expose no space error
When there is not enough space on /userdata, CreateUpdateSnapshot
returns SnapshotManager::Return with ErrorCode::NO_SPACE.

Test: libsnapshot_test
Bug: 138808058

Change-Id: If2effe63f6a4324eff8d05d4db4ce98be8190262
2020-01-07 14:20:44 -08:00
Yifan Hong
e4b44fc501 ImageManager returns FiemapStatus.
IImageManager::CreateBackingImage and ZeroFillNewImage now returns
FiemapStatus, which is an error code and provides more information
about the reason of error.

In particular, the error code is NO_SPACE if disk space is full during
allocation / writing.

Bug: 138808058
Test: libsnapshot_test

Change-Id: I500a3d9f55a2d7e60438b5b4ae70f8b5fed162fa
2020-01-07 13:01:58 -08:00
Yifan Hong
6170c7a02f libfiemap: Create/Open returns FiemapStatus
Add variants to SplitFiemap::Create and FiemapWriter::Open that
returns a FiemapStatus and take a unique_ptr<T>* out parameter to
get more information on the reason of the failure.

Test: fiemap_writer_test
Test: fiemap_image_test
Bug: 138808058
Change-Id: Iea77ac9810f98c2202e038b7aede15dd2d137b2b
2020-01-07 13:01:58 -08:00
Automerger Merge Worker
e62ad865aa Merge "Helper function to mount snapshot devices in recovery" am: 7cd37ba4dc am: 94abcc5bfc
Change-Id: If6a4c363405bf45535e7185aae02e56e858d7f14
2020-01-07 20:44:24 +00:00
Alessio Balsini
94abcc5bfc Merge "Helper function to mount snapshot devices in recovery"
am: 7cd37ba4dc

Change-Id: I4f032327aab79586e83c7d2b5bf1214c4ba53339
2020-01-07 12:30:22 -08:00
Treehugger Robot
7cd37ba4dc Merge "Helper function to mount snapshot devices in recovery" 2020-01-07 20:26:43 +00:00
Automerger Merge Worker
fb1969dfd9 Merge "Add fuzzy_fastboot to vts-core suite" am: 6a606448a0 am: d4120b9065
Change-Id: I00d5368da47e9e3a40a7448a10e7d2c615c1fe30
2020-01-07 19:03:03 +00:00
Dan Shi
d4120b9065 Merge "Add fuzzy_fastboot to vts-core suite"
am: 6a606448a0

Change-Id: I0f834c75b29d3b9ea222e98c39e09158840605ce
2020-01-07 10:45:33 -08:00
Dan Shi
6a606448a0 Merge "Add fuzzy_fastboot to vts-core suite" 2020-01-07 18:21:29 +00:00
Bowgo Tsai
a61c3ab44f Support AVB chain partitions for HASH descriptors
Commit Ida1a6da988c10d364b3ccdaa6c5d63e5264d1b27 allows specifying
AVB-related partitions to be probed in first-state mount, e.g.,
"avb=vbmeta_system" in the fs_mgr_flags will make init wait uevents
for vbmeta_system partition, which is required for AVB verification.

However, when specifying "avb=dtbo" to chain a /dtbo partition, first-stage
init will emit the following error as it assumes all partitions are
verified by Hashtree descriptors.

  init: [libfs_avb]Hashtree descriptor not found: dtbo

This change fixes this by skipping raw partitions for first-stage mounting,
where raw partitions should already be verified by bootloader with Hash
descriptors. Although first-stage init does not perform Hash verification,
it still reads all Hash/Hashtree descriptors to calculate then compare
the "VBMeta Digest" passed from bootloader.

  https://android.googlesource.com/platform/external/avb/#The-VBMeta-Digest

The following is an example of a fstab entry to chain /dtbo partition:

  /dev/block/bootdevice/by-name/dtbo  /dtbo  emmc  defaults  slotselect,avb=dtbo,first_stage_mount

Bug: 146935233
Test: enable /dtbo as a chain partition, then boot the device
Change-Id: I590f1d9b78ef89b5aef21cb7bf19fdb90b27f808
2020-01-07 22:17:27 +08:00
Jiyong Park
016059dd46 Add /system/lib to the permitted paths for ns of APEXes
With b/144533348, there will be symlinks from libs in APEXes to the libs
in the system partition. This is to reduce the size of APEXes when the
APEX is bundled with the platform.

Adding the /system/lib to the permitted paths so that the realpaths of
the symlinks are allowed for the namespaces.

Note that this however does not open all libs in the system partition to
the APEX namespaces, because searching of the libs are NOT done in
/system/lib, but in /apex/<module>/lib directory.

Bug: 144533348
Test: m
Change-Id: I4bb1d6cb5dbf647ae669f49aa5ccb178f5488b5e
2020-01-07 19:53:38 +09:00
Automerger Merge Worker
759c6ff425 Merge "Fix bug in stats_event_benchmark" am: 3bf8858105 am: ae9375f13e
Change-Id: I97b1258c8a41413bd4354d6f1e9441456102d612
2020-01-07 01:01:25 +00:00
Ruchir Rastogi
ae9375f13e Merge "Fix bug in stats_event_benchmark"
am: 3bf8858105

Change-Id: I2194294ddc098edcba44172d82fca061f21b5f3b
2020-01-06 16:48:28 -08:00
Treehugger Robot
3bf8858105 Merge "Fix bug in stats_event_benchmark" 2020-01-07 00:43:49 +00:00