Commit graph

86256 commits

Author SHA1 Message Date
Dennis Shen
2854ab55d0 Merge "Move staging value application logic to persistent_properties and add unit tests" into main am: fa21f12e3b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2801973

Change-Id: Iab84061afd32ac75b4251ee7d23252f8c584ea06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 17:49:00 +00:00
Dennis Shen
fa21f12e3b Merge "Move staging value application logic to persistent_properties and add unit tests" into main 2023-11-02 17:00:44 +00:00
Dennis Shen
79283ef377 Move staging value application logic to persistent_properties and add
unit tests

1, Previous implementation has the staged prop application done in
property_service, which caused a number of unnecessary changes which
including exposing apis like AddPersistentProperty. In addition, it made
the property_service logic complicated. A better design is to have the
staged value application done while reading the persistent properties
from file. This way, no change to property service. In addition, unit
test is much cleaner and efficient.

2, add a unit test to lock down the behavior. Specifically, it locks down that when a prop is staged, it should be applied the next time when the persistent prop is loaded. In addition, it should lock down that other persistent props are not overwritten.

Bug: b/307752841, b/300111812, b/306062513

Change-Id: I43c603efbb803195065dda3f0bc2145716302bbc
2023-11-02 14:17:33 +00:00
Hsiu-Chang Chen
f51ad72a78 Merge changes from topic "revert-2781730-YHMBOJWFHT" into main am: 77aa824423
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2813983

Change-Id: If7bad9bba06657cea3990885cdb891c37fafb891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 04:45:20 +00:00
Hsiu-Chang Chen
77aa824423 Merge changes from topic "revert-2781730-YHMBOJWFHT" into main
* changes:
  Revert "libsnapshot: Add Parser base class"
  Revert "libsnapshot: Add Parser v3 + stub"
2023-11-02 04:24:16 +00:00
Hsiu-Chang Chen
e2ce495aa2 Revert "libsnapshot: Add Parser base class"
Revert submission 2781730

Reason for revert: It breaks build

Reverted changes: /q/submissionid:2781730

Bug: 308868619
Change-Id: I255263d14a1ced57b80efd373dd22eb22bb6efc1
2023-11-02 03:25:24 +00:00
Hsiu-Chang Chen
ad37351bd1 Revert "libsnapshot: Add Parser v3 + stub"
Revert submission 2781730

Reason for revert: It breaks build

Reverted changes: /q/submissionid:2781730

Bug: 308868619
Change-Id: I53b6b619635f150455cdba00237d130cae5df347
2023-11-02 03:25:24 +00:00
Daniel Zheng
d36d4fbce5 Merge changes Ie01f94d0,Iccc9755a into main am: a4c2d78763
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781730

Change-Id: I6e79298c4643293e46a7f7de20d7aaa93e8db973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 01:22:15 +00:00
Daniel Zheng
a4c2d78763 Merge changes Ie01f94d0,Iccc9755a into main
* changes:
  libsnapshot: Add Parser v3 + stub
  libsnapshot: Add Parser base class
2023-11-02 01:05:42 +00:00
Daniel Zheng
4ca81f26d8 libsnapshot: Add Parser v3 + stub
Adding in parser v3 plus stub implementation.

Bug: 307452468
Test: th
Change-Id: Ie01f94d036c2062e34dbdf32456dc0a4612492d3
2023-11-01 13:06:55 -07:00
David Anderson
c165e84b15 libsnapshot: Add Parser base class
Add in Parser base class and refactor code to work with it. Base class
will have ops() method which returns a vector of v3 operations.
v2_parser translates it's v2 operations to v3 operations with this
method.

Bug: 307452468
Test: Test with critical OTA paths?
Change-Id: Iccc9755a892911a1638f5b62d7d6a2402c68ab20
2023-11-01 13:06:54 -07:00
Shin-Yu Wang
0e40a61f58 Merge "Revert "Reapply "Migrate the blkio controller to the v2 cgroup hierarchy""" into main am: 8ebc82576e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2814153

Change-Id: Ic85dd5e7e655c4724d73a2b6d8908f37972cbb54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 07:45:24 +00:00
Shin-Yu Wang
8ebc82576e Merge "Revert "Reapply "Migrate the blkio controller to the v2 cgroup hierarchy""" into main 2023-11-01 07:28:26 +00:00
Shin-Yu Wang
3b16967f0f Revert "Reapply "Migrate the blkio controller to the v2 cgroup hierarchy""
This reverts commit d71f9e5fbb.

Reason for revert: p0 failed test (b/308687042)

Change-Id: I3d8cb899d79634bb1c80f7d05af5c1311358c25c
2023-11-01 06:26:31 +00:00
Christopher Ferris
60feabcabe Merge "Add new segv type SEGV_CPERR." into main am: cb8ee7580d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2813255

Change-Id: Id4aa6c6640523dfb42bca7285153937a8978155f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 02:45:15 +00:00
Christopher Ferris
cb8ee7580d Merge "Add new segv type SEGV_CPERR." into main 2023-11-01 02:14:31 +00:00
Christopher Ferris
6aa72490dc Add new segv type SEGV_CPERR.
The new 6.6 kernel headers added a new segv type, SEGV_CPERR. Add this
to the switch statement.

Test: Unit tests pass.
Change-Id: I77eb4748e51c7e7d7291bfd2180b0ccb3b5a6ded
2023-10-31 14:01:09 -07:00
Treehugger Robot
ba70760164 Merge "Reapply "Migrate the blkio controller to the v2 cgroup hierarchy"" into main am: 848b36c254
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2794128

Change-Id: Iea107d8fad14ea228a716244b6bee47e72df2ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 20:40:50 +00:00
Treehugger Robot
848b36c254 Merge "Reapply "Migrate the blkio controller to the v2 cgroup hierarchy"" into main 2023-10-31 20:00:51 +00:00
Akilesh Kailash
12449ed672 Merge "libsnapshot: Wait for COW path" into main am: 9eeebf7043
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2810376

Change-Id: Id87d7ff48f35ff1ea83f227a56a216db2bf221ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 17:57:05 +00:00
Akilesh Kailash
9eeebf7043 Merge "libsnapshot: Wait for COW path" into main 2023-10-31 17:44:36 +00:00
Treehugger Robot
d7095f37f9 Merge "Initialize the appcompat system property folder" into main am: 1f5e877185
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2786943

Change-Id: Id48871f6813e0501e9ff112d841c8a27ca7a304f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 02:54:00 +00:00
Treehugger Robot
1f5e877185 Merge "Initialize the appcompat system property folder" into main 2023-10-31 02:29:56 +00:00
Bart Van Assche
d71f9e5fbb Reapply "Migrate the blkio controller to the v2 cgroup hierarchy"
This reverts commit c7a6fe684c.
Repply the blkio controller migration because it was not responsible
for the test failures that led to the revert. See also the following bugs:
* https://b.corp.google.com/issues/260143932
  (v2/android-virtual-infra/test_mapping/presubmit-avd test failure)
* https://b.corp.google.com/issues/264620181
  (CtsInitTestCases.RebootTest#StopServicesSIGKILL failure)

The only change compared with the previous version is that the io
controller has been declared optional. This is necessary because some
devices have a kernel that does not support the io controller.

Bug: 213617178
Test: Cuttlefish and various phones
Change-Id: I490740e1c9ee4f7bb5bb7afba721a083f952c8f2
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2023-10-30 16:55:14 -07:00
Akilesh Kailash
8fb49bc0a2 libsnapshot: Wait for COW path
After mapping COW device, wait for the device to appear
before initializing it.

Bug: 305829996
Test: OTA on Pixel
Change-Id: If9e0e1ce684aa15bc9f3fd5a01e4f0421de87e81
Signed-off-by: Akilesh Kailash <akailash@google.com>
2023-10-30 12:14:15 -07:00
Kiyoung Kim
05c59f1233 Merge "Deprecate Vendor Overlay when VNDK is deprecated" into main am: dfe80e48f9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2806073

Change-Id: Ib45734e98b4ef8deea7cb093691eaaef34d3b6cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 05:45:26 +00:00
Kiyoung Kim
dfe80e48f9 Merge "Deprecate Vendor Overlay when VNDK is deprecated" into main 2023-10-30 05:12:37 +00:00
Kiyoung Kim
260e48f07e Deprecate Vendor Overlay when VNDK is deprecated
Vendor overlay was introduced to enable system-only update with small
changes on the vendor, but this is no longer required with same reason
of VNDK deprecation - more frequent Vendor update than expected, and
makes system-vendor interface unstable. This change adds more comments
to explain that Vendor overlay will be deprecated along with VNDK, and
skip test if VNDK is deprecated.

Bug: 307925435
Bug: 307902290
Test: fs_mgr_vendor_overlay_test passed with CF trunk-staging device
Change-Id: I7b9359a5754e8740e749c48f6265a1b0f92f13af
2023-10-30 13:19:12 +09:00
Tomasz Wasilczyk
eca183277d Merge "Allow disabling callstack" into main am: 3f214d7a09
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2806231

Change-Id: I23e7d13eb1581abbe751867c3f05bb5b91440d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-29 01:06:19 +00:00
Tomasz Wasilczyk
3f214d7a09 Merge "Allow disabling callstack" into main 2023-10-29 00:46:54 +00:00
Treehugger Robot
1b152f4337 Merge "Create integration test for fastboot CLI" into main am: fe72eca034
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2803255

Change-Id: If6063150d6776f36364072e0a54e24ec1cf36922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 19:18:25 +00:00
Treehugger Robot
fe72eca034 Merge "Create integration test for fastboot CLI" into main 2023-10-27 18:52:47 +00:00
Tomasz Wasilczyk
b6f459abbc Allow disabling callstack
Bug: 302723053
Test: mma
Change-Id: Idea326cc9914d4c81d75dad287e169c09a736486
2023-10-27 10:48:43 -07:00
William Hester
bdf0b1bb83 Create integration test for fastboot CLI
We rely on parsing the `fastboot devices` output in device labs, and a
format change previously broke us. This test will ensure that the output
is exactly what we expect.

Test: atest --host fastboot_integration_test

Change-Id: I7606e7b3e4a1edfe487ff14bb06cbd3c0a3aa777
2023-10-26 16:51:33 -07:00
Automerger Merge Worker
f1a1d53058 Merge "Merge "vts_fs_test: Do not check /metadata for automotive" into android14-tests-dev am: 76a9eb4374" into main am: 8fbaaa33a1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2800753

Change-Id: I1833b29cc2badeea85d8ba80df11e910601d3450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:22 +00:00
Automerger Merge Worker
8fbaaa33a1 Merge "Merge "vts_fs_test: Do not check /metadata for automotive" into android14-tests-dev am: 76a9eb4374" into main 2023-10-26 21:26:53 +00:00
Treehugger Robot
54f2e06cf5 Merge "vts_fs_test: Do not check /metadata for automotive" into android14-tests-dev am: 76a9eb4374
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2800753

Change-Id: I403f0915937a0c8b24a54b5b265b70b1ce529ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:26:48 +00:00
Christopher Ferris
cf8cd918ab Merge "Fix indices in fuzzer." into main am: 268c408310
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2803177

Change-Id: Ie148a568af931c7ba08d4edc0aa1270eefe513ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:08:18 +00:00
Christopher Ferris
268c408310 Merge "Fix indices in fuzzer." into main 2023-10-26 18:37:06 +00:00
Steven Moreland
99dcd84512 Merge "libutils_binder: isolate headers" into main am: f1168c7b0b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2798774

Change-Id: I5e7693d621a63a52bff723200cfc2274931ae385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 23:48:17 +00:00
Steven Moreland
f1168c7b0b Merge "libutils_binder: isolate headers" into main 2023-10-25 23:13:59 +00:00
Treehugger Robot
76a9eb4374 Merge "vts_fs_test: Do not check /metadata for automotive" into android14-tests-dev 2023-10-25 16:56:56 +00:00
Yi-Yo Chiang
79e5c4f419 Merge "remount: If checkpoint is in progress, wait for it to complete" into main am: a93795deae
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2801314

Change-Id: I97b10cbef0b71e93d46698ca4da990f8b312feab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 06:45:17 +00:00
Yi-Yo Chiang
a93795deae Merge "remount: If checkpoint is in progress, wait for it to complete" into main 2023-10-25 06:22:12 +00:00
Steven Moreland
c738370273 libutils_binder: isolate headers
This isolated all libutils_binder headers from libutils
except for RefBase use of CallStack.h. This header can
be disabled with a macro option easily.

Bug: N/A
Test: N/A
Change-Id: I83af091fc17b5418ab9e4d7fc41fb43792ec547d
2023-10-24 23:45:01 +00:00
Christopher Ferris
14e997fe43 Fix indices in fuzzer.
There are a few places where an index is randomly generated, but the
max is incorrectly set to the size of the value not one less than
the size.

All of these occurrences have been fixed.

Bug: 306230574

Test: Ran fuzzer instance that failed, no longer fails.
Change-Id: I20dfbc19a0df9cb160f8c861e072f083e24a4fab
2023-10-24 14:38:49 -07:00
Yi-Yo Chiang
50dca4a77b remount: If checkpoint is in progress, wait for it to complete
Instead of having the user to retry the `remount` command until success
(manual poll). Just block the remount command until checkpoint is
complete, and then continue.

Bug: 252989722
Test: adb remount on a cold device, remount command would block for a
  few dozens of seconds and then continue.
Test: adb remount on a warm device, remount command would process
  immediately. Do not show "force end checkpointing" instructions.
Change-Id: I65f3a5ade4c9538a55892345c75b45ac3a1755fd
2023-10-24 13:15:03 +00:00
Philip Chen
35817eeb55 vts_fs_test: Do not check /metadata for automotive
This aligns with GAS req 4.0.

Bug: 307215040
Test: build
Change-Id: I2115e147d484d066f892ea50eeca626e64beebfc
2023-10-23 21:43:23 +00:00
David Anderson
0f3636f28f Merge "Refactor off COW header v3" into main am: d1e286f12f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2789989

Change-Id: I928880a8204626e2569a76620a4281589e1816cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 18:49:18 +00:00
David Anderson
d1e286f12f Merge "Refactor off COW header v3" into main 2023-10-23 18:25:46 +00:00