Commit graph

59622 commits

Author SHA1 Message Date
android-build-team Robot
f1db70008a Make change and version bump to r_aml_300802400 for mainline module file: adb/apex/apex_manifest.json
Change-Id: I6bd0d2709a2d06a7cc49c28ddbdf37b643af8e94
2020-06-23 03:15:35 +00:00
Nikita Ioffe
a8e962b5c9 Merge "Explicitly call restorecon_recursive on /metadata/apex" into rvc-dev am: 6a8602a8c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11955299

Change-Id: Id504019ed77bf7c65fc1ae2252a8911804c32630
2020-06-22 21:54:16 +00:00
Nikita Ioffe
6a8602a8c9 Merge "Explicitly call restorecon_recursive on /metadata/apex" into rvc-dev 2020-06-22 21:27:08 +00:00
TreeHugger Robot
aff8c12bff Merge "modprobe: Use more inclusive language for libmodprobe (Part Deux)" into rvc-dev am: a8c92eaae7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11930457

Change-Id: Ia7d2bdc8f01d80f764a5cc7f707ee638d99614c8
2020-06-22 18:28:34 +00:00
TreeHugger Robot
a8c92eaae7 Merge "modprobe: Use more inclusive language for libmodprobe (Part Deux)" into rvc-dev 2020-06-22 18:12:14 +00:00
TreeHugger Robot
0268c01391 Merge "llkd: Use more inclusive language" into rvc-dev am: da0a2ae786
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11930692

Change-Id: I163846505c652a9281f6564e6aa0d5c272a95bb2
2020-06-22 18:05:41 +00:00
TreeHugger Robot
da0a2ae786 Merge "llkd: Use more inclusive language" into rvc-dev 2020-06-22 17:47:17 +00:00
Nikita Ioffe
cf7b6bad55 Explicitly call restorecon_recursive on /metadata/apex
On some devices we see a weird in which /metadata/apex will have a wrong
selinux label. This will effectively prevent such devices from getting
any apex updates. Since we haven't figured out a root cause for this
bug, it's safer to explicitly call restorecon on /metadata/apex to make
sure it's correct.

This change shouldn't affect a normal boot flow, since /metadata/apex
will already have a correct label and restorecon_recursive will be a
no-op.

Test: rm -Rf /metadata/apex && \
    mkdir /metadata/apex &&
    mkdir /metadata/apex/sessions
Bug: 149317789
Change-Id: I971ffe35c93bb79d9e71106c24515ec0ee70333a
2020-06-22 16:56:38 +00:00
android-build-team Robot
56fa8079a1 Make change and version bump to r_aml_300802300 for mainline module file: adb/apex/apex_manifest.json
Change-Id: I007eb3724220351cd44183c1d4455b795c34220f
2020-06-22 03:15:28 +00:00
android-build-team Robot
ff388b339d Make change and version bump to r_aml_300802200 for mainline module file: adb/apex/apex_manifest.json
Change-Id: I19f83a4b7dc4be37734945e9c1ee2bf0a676ae9a
2020-06-20 03:20:06 +00:00
David Anderson
961e68654a Merge "remount: Do not allow remounting during checkpoints." into rvc-dev am: 20d78e3323
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11914026

Change-Id: I1702d186c75a78fec29a9db09695f3da1236cacd
2020-06-19 20:22:02 +00:00
David Anderson
20d78e3323 Merge "remount: Do not allow remounting during checkpoints." into rvc-dev 2020-06-19 20:04:54 +00:00
TreeHugger Robot
a04a7a34b5 Merge "fastboot: copy AVB footer on boot image to end of partition" into rvc-dev am: 5062ea0564
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11917941

Change-Id: I3a257701a74e2de4e0b7aaad94cbb31ee804d088
2020-06-19 19:50:29 +00:00
TreeHugger Robot
5062ea0564 Merge "fastboot: copy AVB footer on boot image to end of partition" into rvc-dev 2020-06-19 19:38:11 +00:00
Steve Muckle
618ca3400d fastboot: copy AVB footer on boot image to end of partition
If the flashed boot image is smaller than the block device, the AVB
footer will not be at the end of the partition. Although images are
normally created to match the partition size the GKI boot.img must work
on all devices, and the size of the boot partition will vary.

Copy the AVB footer to the end of the partition before flashing, if it
is not there already.

Bug: 159377163
Change-Id: I5a5e25fb54dc9d6a2930fda63434968808ffa1f0
Merged-In: I5a5e25fb54dc9d6a2930fda63434968808ffa1f0
2020-06-19 11:35:01 -07:00
Mark Salyzyn
4ca9fa9e10 llkd: Use more inclusive language
Documentation is synchronized to match external, to ease updating.

blacklist is replaced with ignorelist or ignore depending on context.

Bug: 159345740
Test: none
Merged-In: I6db7ad321684759e3c5ac1f66f940b6e8a5709a0
Change-Id: I6db7ad321684759e3c5ac1f66f940b6e8a5709a0
2020-06-19 06:51:59 -07:00
Mark Salyzyn
21c02bbd4b modprobe: Use more inclusive language for libmodprobe (Part Deux)
Remove blacklist

Test: none
Bug: 151950334
Merged-In: I14ed08390a7db0b4b962343c61d60230751047ce
Change-Id: I14ed08390a7db0b4b962343c61d60230751047ce
2020-06-19 06:33:08 -07:00
android-build-team Robot
86c26e68fd Make change and version bump to r_aml_300802100 for mainline module file: adb/apex/apex_manifest.json
Change-Id: I59280498d251551e09708a21ec060d9640bb64e9
2020-06-19 07:16:03 +00:00
David Anderson
9aeae82f69 remount: Do not allow remounting during checkpoints.
Bug: 157540389
Test: manual test
Change-Id: I5931a583e48ddac05f319629ae2f7f5f0f6cf032
Merged-In: I5931a583e48ddac05f319629ae2f7f5f0f6cf032
2020-06-18 23:10:10 +00:00
TreeHugger Robot
a243f6d9c2 Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 507d21905b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11886201

Change-Id: Iab8fd254f90f004ba05e640bcd8507e63ab915da
2020-06-18 22:35:55 +00:00
TreeHugger Robot
507d21905b Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev 2020-06-18 22:22:57 +00:00
Paul Lawrence
39c7961c90 Don't call block checkpoint functions above dm-default-key
Bug: 156225476
Test: Build for f2fs and ext4 device, make sure checkpoints roll back
and commit

Merged-In: I7a772ff712dec9e69df175de840d69d296c65923
Change-Id: I7a772ff712dec9e69df175de840d69d296c65923
2020-06-18 21:58:57 +00:00
TreeHugger Robot
11f646715b Merge "modprobe: Use more inclusive language for modprobe and libmodprobe" into rvc-dev am: 54e693e6d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11915103

Change-Id: Idc8e7547d830397c6c993b98a957f1820c05409b
2020-06-18 20:59:17 +00:00
TreeHugger Robot
54e693e6d7 Merge "modprobe: Use more inclusive language for modprobe and libmodprobe" into rvc-dev 2020-06-18 20:46:11 +00:00
Tim Murray
56c222246e Merge "Move zygote64 into the top-app stune group." into rvc-dev am: 4dc1d5f3de
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11884893

Change-Id: I68ff2f1e7aca8f128aeb22b7d396688e51f4df81
2020-06-18 19:37:37 +00:00
Tim Murray
4dc1d5f3de Merge "Move zygote64 into the top-app stune group." into rvc-dev 2020-06-18 19:15:39 +00:00
Tim Murray
e2318a2fce Move zygote64 into the top-app stune group.
Improve app startup performance before the new app is in the top-app
cpuset.

Test: boots, zygote64 in top-app stune group
Bug: 159201879

Change-Id: I3aad4b4b1d2f54db9e7ba86db8a655d8552bad0a
2020-06-18 10:43:01 -07:00
Mark Salyzyn
502cb7af75 modprobe: Use more inclusive language for modprobe and libmodprobe
blacklist is replaced with blocklist.

Test: none
Bug: 151950334
Merged-In: I59f9fde5900b9aee82aca1eab4a6ded3d136063b
Change-Id: I59f9fde5900b9aee82aca1eab4a6ded3d136063b
2020-06-18 09:46:37 -07:00
Narayan Kamath
0a043f18bd Merge "Fix Deadlock Issue On AppFuseBridge" into rvc-dev am: 17fcd95f64
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11888503

Change-Id: I7b4d33a152e959774a8ae0292bab2a927586a7de
2020-06-18 10:35:04 +00:00
Narayan Kamath
17fcd95f64 Merge "Fix Deadlock Issue On AppFuseBridge" into rvc-dev 2020-06-18 10:15:55 +00:00
android-build-team Robot
6204414809 Make change and version bump to r_aml_300802000 for mainline module file: adb/apex/apex_manifest.json
Change-Id: I74a98a83b018b40df0711373ab9b5b7103d68836
2020-06-18 07:15:57 +00:00
Tom Cherry
70bd4b1a58 liblog: fix reading pmsg am: 709d569241
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11899686

Change-Id: I9f2448268928c18343a2e22964437c8edd3a2cad
2020-06-17 22:41:43 +00:00
Tom Cherry
709d569241 liblog: fix reading pmsg
d3ecc66b9c "liblog: support extended logger_entry headers" removed
the logger_entry::msg variable and instead uses hdr_size as an offset
from logger_entry to where the message starts in parent log_msg
buffer.

In pmsg, hdr_size is not recorded and therefore uninitialized when it
was referenced, causing corruption when reading last logcat.  This
change uses sizeof(log_msg->entry) instead.

Bug: 158263230
Test: last logcat works
Merged-In: Ic01e73bf4d8ba8419cc770138565aa1210a6078b
Change-Id: Ic01e73bf4d8ba8419cc770138565aa1210a6078b
(cherry picked from commit 34d7bd98ad)
2020-06-17 13:54:58 -07:00
android-build-team Robot
1687e42a75 Make change and version bump to r_aml_300801900 for mainline module file: adb/apex/apex_manifest.json
Change-Id: I6304f8f10109fbdb5ecedb9e829b3d6334a761ad
2020-06-17 19:56:28 +00:00
hyeeun.jun@samsung.com
612fc47090 Fix Deadlock Issue On AppFuseBridge
There are two locks used by AppFuseBridge.
First is it's object lock, and the second is a mutex lock in app fuse library.
There are two oppsite routines to get those locks.

  (Thread A) Got Java lock -> Try to get Native lock
  (Thread B)        Got Native lock -> Try to get Java lock

The order must be followed to obtain two locks.
If not, the dead lock will be caused.
Therefore we change the routine to get the mutex lock first, and the object lock later.

Signed-off-by: hyeeun.jun@samsung.com <hyeeun.jun@samsung.com>
Bug: https://issuetracker.google.com/issues/145707568
Bug: 157535024
Test: atest --test-mapping apex/blobstore

Change-Id: I0ab002da9a0b7ca2f518d50ab477a080cabe3788
2020-06-17 13:39:21 +01:00
android-build-team Robot
2a613052e0 Make change and version bump to r_aml_300801800 for mainline module file: adb/apex/apex_manifest.json
Change-Id: I67412c29ed3bd211cd34196b5685d8750c37de6c
2020-06-17 07:17:09 +00:00
Tom Cherry
d4806c635a fsmgr: fix integer overflow in fs_mgr am: e28dc48de5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11882481

Change-Id: Iade7ea2ae1b606af1418053b68b00e3d25fcd155
2020-06-17 00:19:17 +00:00
Tom Cherry
e28dc48de5 fsmgr: fix integer overflow in fs_mgr
As the EXT4_MAX_BLOCK_SIZE defined as 65536 which reached maxium value
of unsigned int. The superblock value maybe larger than 65536. This is
found by the Integer Overflow Sanitizer.

This patch fixed below boot error when userdata is corrupted:
init: processing action (fs) from
(/vendor/etc/init/hw/init.freescale.rc:221)
init: [libfs_mgr]Invalid ext4 superblock on '/dev/block/by-name/userdata'
init: InitFatalReboot: signal 6 init: #00 pc 00000000000af7e8  /system/bin/init
(android::init::InitFatalReboot(int)+208) init: #01 pc 00000000000afbd0  /system/bin/init
(android::init::InstallRebootSignalHandlers()::$_22::__invoke(int)+32)
init: #02 pc 00000000000006bc  [vdso:0000ffff9691b000] (__kernel_rt_sigreturn)
init: #03 pc 000000000004e070  /system/lib64/bootstrap/libc.so (abort+176)
init: #04 pc 000000000003427c  /system/lib64/libfs_mgr.so
(read_ext4_superblock(std::__1::basic_string<char, std::__1::char_
traits<char>, std::__1::allocator<char> > const&,
android::fs_mgr::FstabEntry const&, ext4_super_block*, int*)+1804)

Test: boot with corrupted ext4 superblock
Bug: 156200421

Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
Change-Id: Ib1b69bf4623f69696cb637b226ec3359fc2ed409
(cherry picked from commit cb472b92e5)
2020-06-16 23:32:39 +00:00
android-build-team Robot
157a105d46 Make change and version bump to r_aml_300801700 for mainline module file: adb/apex/apex_manifest.json
Change-Id: Ia721a85c7321b1316ef186221edd2f9f49c552f9
2020-06-16 07:15:04 +00:00
Yifan Hong
9f5f5feeb0 libsnapshot_test: hardcode alignment. am: 755eb6b606
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11870537

Change-Id: I768ca328300d5e741f25bbe45106ca9bffc2d00c
2020-06-15 23:50:33 +00:00
Yifan Hong
755eb6b606 libsnapshot_test: hardcode alignment.
SnapshotUpdateTest uses a relatively small super partition, which
requires a small alignment and 0 alignment offset to work. For the
purpose of this test, hardcode the alignment and offset.
This test isn't about testing liblp or libdm.

Fixes: 154355449
Fixes: 157437632
Bug: 158718136
Bug: 157633441
Bug: 154646936

Test: atest on devices with alignment of data partition >= 512KiB

Change-Id: I1d0474f028cc824bd4197d0228350395239b3b81
(cherry picked from commit 31739669e91c7a3afc5bee23e43bc45fb4154667)
Merged-In: I1d0474f028cc824bd4197d0228350395239b3b81
2020-06-15 14:00:12 -07:00
android-build-team Robot
ec54be6082 Make change and version bump to r_aml_300801600 for mainline module file: adb/apex/apex_manifest.json
Change-Id: I85ad9bdcb8d2bb3a24e1664b9ba3280b1a540cb9
2020-06-15 07:15:15 +00:00
android-build-team Robot
42f32a6bd1 Make change and version bump to r_aml_300801500 for mainline module file: adb/apex/apex_manifest.json
Change-Id: Ic2c480c0922ac22ab9d2ef8420555d7722d6f2ab
2020-06-14 07:20:18 +00:00
Randall Huang
1c73e42706 Try to recover corrupted ext4 /data with backup superblock am: 4e864e1216
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11835152

Change-Id: I53521b29b855ba03ff126be73690fd3c0a4d75d7
2020-06-12 17:33:05 +00:00
android-build-team Robot
f46bbc5609 Make change and version bump to r_aml_300801400 for mainline module file: adb/apex/apex_manifest.json
Change-Id: If42da0d917943a6f207d293e846f7fd6e94f1481
2020-06-12 07:20:00 +00:00
Randall Huang
4e864e1216 Try to recover corrupted ext4 /data with backup superblock
If the superblock of /data is corrupted, fs_mgr would skip check_fs.
But, e2fsck actually may reference backup superblock to recover
the filesystem. This fix gives fs_mgr second chance to fix corrupted
ext4 /data.

Bug: 156200421
Test: boot with corrupted ext4 superblock

Signed-off-by: Randall Huang <huangrandall@google.com>
Change-Id: Ieb89e7274d772962fe37927dcd62567dd5aa4657
(cherry picked from commit 72abd7b246)
2020-06-12 02:07:35 +00:00
TreeHugger Robot
9b3d27f4d8 Merge "liblp: Remove tests for alignment_offset being 0." into rvc-dev am: 2d51d38224
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11817320

Change-Id: I426268cbbd9da005eefa7fbfe85613f393f532ce
2020-06-11 19:28:26 +00:00
TreeHugger Robot
2d51d38224 Merge "liblp: Remove tests for alignment_offset being 0." into rvc-dev 2020-06-11 19:17:55 +00:00
Ruchir Rastogi
203abd116b Merge "Do not truncate AStatsEvent buffers" into rvc-dev am: 172562dc90
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11832292

Change-Id: I8fdb0174485233b57e93861c7c193d47f5d09b12
2020-06-11 18:12:04 +00:00
Ruchir Rastogi
172562dc90 Merge "Do not truncate AStatsEvent buffers" into rvc-dev 2020-06-11 17:57:06 +00:00