Commit graph

84365 commits

Author SHA1 Message Date
Yi-Yo Chiang
ed0de0be90 Merge "fs_mgr: Use /proc/mounts to check if /cache is mounted" into main am: 7881073ec8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2745619

Change-Id: Ica993eb012ed1dba6e86b7378ab96e6a4c7c2678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 07:08:14 +00:00
Yi-Yo Chiang
7881073ec8 Merge "fs_mgr: Use /proc/mounts to check if /cache is mounted" into main 2023-09-13 06:46:58 +00:00
Christopher Ferris
40aa3a7125 Merge "Disable warning which is not detecting problems." into main am: 0e0d682d8e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2748855

Change-Id: Ic11c33515954bbe4dd26c2605e6e87f662865ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 22:02:32 +00:00
Christopher Ferris
0e0d682d8e Merge "Disable warning which is not detecting problems." into main 2023-09-12 21:27:50 +00:00
Tomasz Wasilczyk
2b3630be4d Merge "Implement android::String access methods that avoid C string cast" into main am: 771bda6c0b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2748673

Change-Id: I8465ee304ef29af2104744ff7af5c713864246af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 21:14:34 +00:00
Tomasz Wasilczyk
771bda6c0b Merge "Implement android::String access methods that avoid C string cast" into main 2023-09-12 20:43:20 +00:00
Christopher Ferris
f58b009b7b Disable warning which is not detecting problems.
A clang update enabled -Wreorder-init-list by default. Since it doesn't
provide any benefit to the debuggerd code, disable the warning.

Test: Builds without warnings.
Change-Id: I75cfe064ba92c74312ba33f329b1364258eba06c
2023-09-12 13:01:10 -07:00
Tomasz Wasilczyk
86c9ea8f86 Implement android::String access methods that avoid C string cast
Bug: 295394788
Test: m checkbuild
Change-Id: If25fd69319171e8c549fc8fcfd95a0819291d8e6
2023-09-12 17:25:29 +00:00
Tomasz Wasilczyk
74ee2a40f2 Merge "Revert "Revert "Revert "Revert "Drop all path-related methods from android::String8""""" into main am: 8245afd47d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2747144

Change-Id: I516a496f3299bc207ab1c1e2c5789cf61777ef86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 14:32:50 +00:00
Tomasz Wasilczyk
8245afd47d Merge "Revert "Revert "Revert "Revert "Drop all path-related methods from android::String8""""" into main 2023-09-12 14:02:13 +00:00
Yi-Yo Chiang
244e581a31 fs_mgr: Use /proc/mounts to check if /cache is mounted
The fstab provided by the user/caller might not be the default fstab,
which might not include the /cache mount entry. We should just use the
procfs mount info to determine if /cache is currently mounted.

Bug: 300036012
Test: adb_remount test
Change-Id: I4643d0a21ae21f3513f715de424f0be1fe64ff9e
2023-09-12 16:08:30 +08:00
Daniel Zheng
e7360f4eb3 Merge "Adding test for IsDynamicPartition" into main am: 1b547892f6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2727086

Change-Id: I5d5cbf130a44fe74e832ffe03040c1c9f3abae9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 22:09:40 +00:00
Daniel Zheng
b5bb46cd25 Merge "documenting optimized flash super" into main am: a3b232c30c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2725774

Change-Id: I68a8ae36335a2aec2ea1e085a672da649552d319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 22:08:38 +00:00
Daniel Zheng
1b547892f6 Merge "Adding test for IsDynamicPartition" into main 2023-09-11 21:06:32 +00:00
Daniel Zheng
a3b232c30c Merge "documenting optimized flash super" into main 2023-09-11 21:06:02 +00:00
Tomasz Wasilczyk
a1853516ff Revert "Revert "Revert "Revert "Drop all path-related methods from android::String8""""
This reverts commit 141255f30c.

Reason for revert: Attempt re-submit again

Change-Id: I0e568fdf8f7a141ee3c5d54f68530ff478a47439
2023-09-11 17:45:16 +00:00
Rhed Jao
494f1ea496 Merge "Revert "Revert "Revert "Drop all path-related methods from android::String8"""" into main am: d395f638fa
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2744996

Change-Id: I666d28c5fc2f8a06c70fed42f686e3650588fda6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 04:22:24 +00:00
Rhed Jao
d395f638fa Merge "Revert "Revert "Revert "Drop all path-related methods from android::String8"""" into main 2023-09-11 03:43:31 +00:00
Rhed Jao
141255f30c Revert "Revert "Revert "Drop all path-related methods from android::String8"""
This reverts commit 4b6a7c3940.

Reason for revert: b/299695302, b/299694769

Change-Id: I89c6719d23446f2f9ce24e5b75d321538b580431
2023-09-11 02:05:58 +00:00
Akilesh Kailash
eaf919aa34 Merge "libsnapshot_cow: Prepare device to boot from pre-created snapshots" into main am: 6b78aac2cf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2746258

Change-Id: Ifd60bf5bd01084a28a47244fefdf7867a62ac10c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-09 07:47:07 +00:00
Akilesh Kailash
6b78aac2cf Merge "libsnapshot_cow: Prepare device to boot from pre-created snapshots" into main 2023-09-09 07:03:40 +00:00
Akilesh Kailash
bcae6b5e60 libsnapshot_cow: Prepare device to boot from pre-created snapshots
Two new API's have been added:

1: BootFromSnapshotsWithoutSlotSwitch: This will create a new marker
which indicates first-stage init to mount the partitions off snapshots.

We need this marker as during boot, there are couple of places during
mounting snapshots wherein the marker is used. However, there is no
change in the existing I/O path related to OTA.

2: PrepareDeviceToBootWithoutSnapshot: This will delete the marker so
that subsequent reboot will not have the partitions mounted without the
snapshots.

VTS tests covers both these API's. Additionally, when these
markers are present, new OTA's cannot be installed. All these
are covered in VTS tests.

===========================================================

snapshotctl: General flow to apply and revert pre-created snapshots

1: To install the pre-created snapshots:

$snapshotctl map-snapshots <directory path containing snapshots patches>

Now the device is ready to boot from snapshots.

2: After device reboots, partitions are mounted off the snapshots. There
   is no snapshot-merge.

3: In order to go back to previous build:

$snapshotctl revert-snapshots

Now the device is ready to boot from base build.

4: After device reboots back to previous build, all the snapshot states
   and COW images are removed.

============================================

Additional commands:

To delete the pre-created snapshots:

$snapshotctl delete-snapshots

======================================

Tested it on Pixel 6 Pro between two builds which are ~24 hours apart.

1: Creating snapshots on a linux-host - ~4-6 seconds
2: Applying pre-created snapshots - ~10-15 seconds (includes intermediate
   transfer of patches to the device). This depends on the size of snapshot patches.
3: Device reboot - ~12-14 seconds.

Bug: 299011882
Test: 1: Apply pre-created snapshots
2: Reboot device: Verify new build
3: Apply OTA when partitions are mounted of snapshots and verify OTA
   fails.
3: Revert-snapshot and reboot.
4: Verify device goes back to base build.

Full OTA on Pixel. vts_libsnapshot_test

Change-Id: I36a72d973d8f70ae49773ebd45dd996fac22a4e3
Signed-off-by: Akilesh Kailash <akailash@google.com>
2023-09-08 23:09:45 -07:00
Tomasz Wasilczyk
e4fc1fb947 Merge "Revert "Revert "Drop all path-related methods from android::String8""" into main am: b2b037d9f0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2745823

Change-Id: Id12d272082e193559f09793fb6d12329ed18b4a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 20:30:51 +00:00
Tomasz Wasilczyk
b2b037d9f0 Merge "Revert "Revert "Drop all path-related methods from android::String8""" into main 2023-09-08 19:59:48 +00:00
Tomasz Wasilczyk
5e890d37e9 Merge "Drop String8::std_string" into main am: 9cbae9d75b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2745821

Change-Id: I8d820356619fe8067c892586087e7d3263b9e8f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 18:55:15 +00:00
Tomasz Wasilczyk
9cbae9d75b Merge "Drop String8::std_string" into main 2023-09-08 18:17:25 +00:00
Ross Kettleson
f7bb2d3871 Merge "Revert "Drop all path-related methods from android::String8"" into main am: acc7ff19f9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2745822

Change-Id: I78a8590c20b437779ed0231041addf5f46b11b9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 18:09:15 +00:00
Tomasz Wasilczyk
4b6a7c3940 Revert "Revert "Drop all path-related methods from android::String8""
This reverts commit cff2e40d19.

Reason for revert: Attempt re-submit

Change-Id: I8802b519e4ae3046858b854815ba580c7a6b965d
2023-09-08 11:03:59 -07:00
Ross Kettleson
acc7ff19f9 Merge "Revert "Drop all path-related methods from android::String8"" into main 2023-09-08 17:09:54 +00:00
Tomasz Wasilczyk
cff2e40d19 Revert "Drop all path-related methods from android::String8"
This reverts commit b9dc1c2991.

Reason for revert: http://b/299624573

Change-Id: I0d5993295df65ec31c180b6b5a76fbe939891f45
2023-09-08 17:08:39 +00:00
Tomasz Wasilczyk
adaf33026a Drop String8::std_string
This method was preserved under assumption it would be baked into many
prebuilts, but since it's inline, there should be no linkage to libutils
- thus, should be safe to remove anyway.

Bug: 35363681
Bug: 295394788
Test: treehugger
Change-Id: I59964935600e9e786424136177bfc8a70bebec67
2023-09-08 09:51:24 -07:00
Tomasz Wasilczyk
eb6aa6ae0f Merge "Drop all path-related methods from android::String8" into main am: cc64ed9865
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2724277

Change-Id: I810db0b728028c24e984e98e5a5e0b92114dac87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 15:42:26 +00:00
Tomasz Wasilczyk
cc64ed9865 Merge "Drop all path-related methods from android::String8" into main 2023-09-08 14:47:14 +00:00
Hongguang Chen
426e8bf306 Merge "Only restart media.tuner when it's running" into main am: f3dd1c9389
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2745819

Change-Id: Iace55a4feec3aed0935c737db612b0e3925c2933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 06:54:20 +00:00
Hongguang Chen
f3dd1c9389 Merge "Only restart media.tuner when it's running" into main 2023-09-08 06:06:50 +00:00
Hongguang Chen
32f6920404 Only restart media.tuner when it's running
Fix: 287520719
Test: Kill system_server on TV device w/o tuner. media.tuner is not restarted.
Change-Id: I13006f16746a12c33960feca1288aa17ef2ed9c9
2023-09-08 04:19:34 +00:00
Chun-Wei Wang
a564954bc8 Merge "Disallow fastboot to modify locked DSU" into main am: 66b68dde92
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2744993

Change-Id: I39173cd7c8b05cf9724e585808c78ab50c7bae0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 03:42:17 +00:00
Tomasz Wasilczyk
b9dc1c2991 Drop all path-related methods from android::String8
Move them to androidfw and aapt, the last users.

Bug: 295394788
Test: m checkbuild
Change-Id: I7268b88d11bf221f93efed06cfd1ee65449a2421
2023-09-08 03:07:52 +00:00
Chun-Wei Wang
66b68dde92 Merge "Disallow fastboot to modify locked DSU" into main 2023-09-08 02:59:32 +00:00
Elliott Hughes
1d4fc0b9c2 Merge "Remove stray newline from err() call." into main am: f00639393a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2746273

Change-Id: If0fac41b352a1c8562e46009d76d40e9c23b7cfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:22:28 +00:00
Julien Desprez
49b04b7a82 Merge "Reland exporting create_snapshot" into main am: 5b3f7c3283
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2745757

Change-Id: I0b33232aa996505cb8003312d8213fbc89edba98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:20:18 +00:00
Elliott Hughes
f00639393a Merge "Remove stray newline from err() call." into main 2023-09-07 20:39:36 +00:00
Julien Desprez
5b3f7c3283 Merge "Reland exporting create_snapshot" into main 2023-09-07 20:15:59 +00:00
Elliott Hughes
a8e259db66 Remove stray newline from err() call.
err() does this itself, and includes strerror() too.

Test: treehugger
Change-Id: I0e844f9cc3992e80a302b2f3ca1084b165582a9b
2023-09-07 19:30:31 +00:00
Daniel Zheng
3d23275859 Merge "Adding testing for optimized flash super" into main am: 7d8ac7f122
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2725773

Change-Id: I2b4c116da18f15fd075559607d304fab0e1e6feb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 17:18:32 +00:00
Julien Desprez
670f983f45 Reland exporting create_snapshot
Previous attempt: aosp/2743815
Disabled on windows & mac.

Test: presubmit, (previously failed build: https://android-build.googleplex.com/builds/abtd/run/L06100000962955289?referrer=email now passing)
Bug: 290951369
Change-Id: I3d8084c13d843ea5919e3b50a0513faf386ccfed
2023-09-07 17:05:50 +00:00
Daniel Zheng
7d8ac7f122 Merge "Adding testing for optimized flash super" into main 2023-09-07 16:12:30 +00:00
Marvin Ramin
ec37283a03 Merge "Revert "Export create_snapshot to sdk targets"" into main am: b03378fe71
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2743796

Change-Id: I198fec6b385cf95e70b8e678e23133d5bf514506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 10:04:06 +00:00
Marvin Ramin
b03378fe71 Merge "Revert "Export create_snapshot to sdk targets"" into main 2023-09-07 09:11:57 +00:00
Marvin Ramin
a4d34c5715 Revert "Export create_snapshot to sdk targets"
This reverts commit bf72b25a07.

Reason for revert: DroidMonitor: Culprit for b/299411079

Change-Id: I9d46abcbcc81d43fde23d4431b6757d3520d4b2c
2023-09-07 09:03:25 +00:00