Commit graph

78394 commits

Author SHA1 Message Date
Deyao Ren
f71d80a154 Merge "Clean up services created after running test" am: 2880afb77f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2209900

Change-Id: I2c9a38b428d8264e1904b73a904d8b82f865b40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 16:50:11 +00:00
Deyao Ren
2880afb77f Merge "Clean up services created after running test" 2022-09-09 16:20:31 +00:00
deyaoren@google.com
909bc47536 Clean up services created after running test
Services created during new tests weren't properly cleaned up after tests. It caused slowdown of subsequent tests as described in b/244486404.
This change kills/terminates services after test with apex services.

To provide some context, original change is at https://android-review.googlesource.com/q/topic:vapex_stop_service. The issue was discovered by android test monitor and filed as a P0 bug.

Bug: 244486404
Change-Id: Ie64e0eb1686e94ef543a457ea49d1d7aeab38c97
2022-09-09 04:15:26 +00:00
Spandan Das
dad50f950b Merge "Declare the headers of the ndk_library" am: a23b5467dc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2211949

Change-Id: Ifcbd2661f15817318fe882329b501b5b7b4fb182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 00:27:24 +00:00
Spandan Das
a23b5467dc Merge "Declare the headers of the ndk_library" 2022-09-08 23:53:18 +00:00
Spandan Das
9b4bc28b43 Declare the headers of the ndk_library
This creates a dependency edge between the ndk_library and its headers,
which should be a no-op in regular Soong builds. This dependency edge
will be used in the Multi-tree project to export the relevant .h files into a well
known location

Test: m nothing
Bug: 239044713
Change-Id: I374b1529456c4c71ac419b4684f2fd215c68e791
2022-09-08 21:59:20 +00:00
David Anderson
9b60fd39e5 Merge "vts_libsnapshot_test: Fix test flakiness." am: 0dfbdc5bdb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199352

Change-Id: I83eb0010991c945233bf9dbff56e5322736d8311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 20:16:21 +00:00
David Anderson
0dfbdc5bdb Merge "vts_libsnapshot_test: Fix test flakiness." 2022-09-08 19:44:05 +00:00
Treehugger Robot
7ce0d570e8 Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: a5d944f67d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2210342

Change-Id: I8909574a544fcbb6a5bfd0564a5f934af213d475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 17:37:12 +00:00
Treehugger Robot
a5d944f67d Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" 2022-09-08 17:03:26 +00:00
Bob Badour
9cf81ccfef [LSC] Add LOCAL_LICENSE_KINDS to system/core
Added SPDX-license-identifier-Apache-2.0 to:
  init/test_upgrade_mte/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I77b956ed672a2f171b78ab1e7bfddc09bd0dc158
2022-09-08 15:23:25 +00:00
Treehugger Robot
342cfadb06 Merge "Change log level in mount_with_alternatives()" am: 34386d2d29
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2209039

Change-Id: If9ffc952c9008f017790c6add4defcd640e7542a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 13:30:13 +00:00
Treehugger Robot
34386d2d29 Merge "Change log level in mount_with_alternatives()" 2022-09-08 13:12:03 +00:00
Sandro Montanari
8ee78c7c3a Merge "Remove /dev/selinux directory creation from first_stage_init.cpp" am: 4b3c063ac3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2208840

Change-Id: I8f4dc3e209b5023be3700da39ffeae9d5181555c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 09:05:19 +00:00
Sandro Montanari
4b3c063ac3 Merge "Remove /dev/selinux directory creation from first_stage_init.cpp" 2022-09-08 08:37:05 +00:00
David Anderson
7834809350 vts_libsnapshot_test: Fix test flakiness.
This patch fixes a few lingering issues in vts_libsnapshot_test.

The most important fix is a crash in snapuserd when handler deletion
races with the merge monitor thread. Since tests issue lots of
snapshot-related requests in rapid succession, this was easy to hit in
presubmit, and resulted in a null-pointer deref.

SnapuserdClient's CloseConnection does the same thing as the destructor,
but leaves SnapuserdClient in an unusable state. This method is removed
in favor of RAII.

Fix a bug in SnapshotManager where CloseConnection could be called
without zapping snapuserd_client_.

Fix a bug where POLLHUP was checked before calling recv().

Add test name logging so presubmit failures can be diagnosed via logcat
dumps.

Bug: N/A
Test: vts_libsnapshot_test on cuttlefish
Change-Id: I8f22a45e537c24a3c6d327ac47bf8b1352108706
2022-09-07 21:58:03 -07:00
Sandro Montanari
f3ce0486e1 Merge "Create /dev/selinux folder if it was not created by first-stage-init" am: 344f71605c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2203897

Change-Id: If4d1d10dd9cf313ce574b02d3736371c4663ef75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 15:32:45 +00:00
Sandro
d01921034c Remove /dev/selinux directory creation from first_stage_init.cpp
Follow-up from aosp/2203897

Bug: 243923977
Test: m and manual verification
Change-Id: I9e41301d2fe4447906253a5c1249dc6c25cd5218
2022-09-07 15:04:59 +00:00
Sandro Montanari
344f71605c Merge "Create /dev/selinux folder if it was not created by first-stage-init" 2022-09-07 15:01:51 +00:00
Sandro
1120f7f4a9 Create /dev/selinux folder if it was not created by first-stage-init
The /dev/selinux folder is normally created by first-stage-init
https://cs.android.com/android/platform/superproject/+/master:system/core/init/first_stage_init.cpp;l=299-300;drc=07c86bace1e7a7cc4dd975f10b077d21c3743749

However, in some cases the first-stage-init comes from a GKI prebuilt
boot.img and doess not create the required folder (see for example
b/217677967), resulting in bugs like b/244793900.

I modified the selinux.cpp code to create the /dev/selinux folder if it
does not exist already, as a safety measure.

To verify these changes for b/244793900, follow gpaste/4922166775644160

Bug: 243923977
Test: atest SeamendcHostTest, manual verification
Change-Id: I8fe798643b1aeab2b4caac837055348febf70b94
2022-09-07 11:31:47 +00:00
Bowgo Tsai
0db62f43de Change log level in mount_with_alternatives()
mount_with_alternatives() supports mounting any of the
consecutive fstab entries. Some log messages shouldn't
be treated as error so changing log level to INFO instead.

Bug: 245468764
Test: TreeHugger
Change-Id: I94a18d4cf91ee5bb58cf5ba5f853a0e6599071d1
2022-09-07 18:45:36 +08:00
Treehugger Robot
aa83e839b0 Merge "Add fdsan capabilities for native handles" am: 98e474ab43
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199556

Change-Id: I2a2274988755c33d4eb3719f78bc50638782048b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 23:04:33 +00:00
Treehugger Robot
98e474ab43 Merge "Add fdsan capabilities for native handles" 2022-09-06 22:48:31 +00:00
Treehugger Robot
ea5829fa05 Merge "Upgrade MTE to SYNC after ASYNC crash." am: c113dc3a95
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2108595

Change-Id: I23cc0bd580c7c755158bc916d9d9fdbcddb8334c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 21:56:38 +00:00
Treehugger Robot
c113dc3a95 Merge "Upgrade MTE to SYNC after ASYNC crash." 2022-09-06 21:29:14 +00:00
Florian Mayer
2ef47f8f6d Upgrade MTE to SYNC after ASYNC crash.
Bug: 169277947
Test: atest mte_ugprade_test on emulator.
Test: ASSUMPTION_FAILED on non-MTE
Test: ASSUMPTION_FAILED on HWASan
Change-Id: I5328d094ffb106abaa548feb76058c9ebd11d745
2022-09-06 20:10:57 +00:00
Treehugger Robot
5caaa2590e Merge "Only run Service::Start() under root" am: 752437b0c7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2207038

Change-Id: I9f46cc564b7af2b2d098373d0c68a119e398707b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 14:11:19 +00:00
Treehugger Robot
752437b0c7 Merge "Only run Service::Start() under root" 2022-09-06 13:52:42 +00:00
Jooyung Han
93c24d7e65 Only run Service::Start() under root
Tests using Service::Start() should run under root. Otherwise tests fail
to start services from the test binary due to lack of permission.

Bug: 244748231
Test: CtsInitTestCases
Change-Id: Ia4eb8457cfad7d44da6b171e44f64238e08af9f7
2022-09-06 10:03:47 +09:00
Yi-yo Chiang
b781344780 Merge "adb-remount-test: Miscellaneous fixes - 2nd round" am: 9a0a9db6af
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2200533

Change-Id: Ida5f5cb3e3209d15d1026258153cfe4ff38fcc92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 09:01:21 +00:00
Yi-yo Chiang
9a0a9db6af Merge "adb-remount-test: Miscellaneous fixes - 2nd round" 2022-09-05 08:33:31 +00:00
Yi-yo Chiang
5676d384ef Merge changes I2360314c,I51bd32c6,Icb136327,Id8425488 am: 10b691284c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2200439

Change-Id: I4248b909181be6cf1d150a92b4716f403494d63b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 06:30:47 +00:00
Yi-yo Chiang
10b691284c Merge changes I2360314c,I51bd32c6,Icb136327,Id8425488
* changes:
  adb-remount-test: Refactor test cleanup
  adb-remount-test: Replace libc.so test with build.prop test
  adb-remount-test: Check override_creds only if overlayfs is used
  adb-remount-test: Print log timestamp & auto-detect color
2022-09-05 05:59:36 +00:00
Yi-yo Chiang
6013e1cd3d Merge "adb-remount-test: Refactor raw remount & remount from scratch test" am: 78430afca4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199115

Change-Id: I560a66119a8dc9885297417da06f3608f48f82a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 04:16:55 +00:00
Yi-yo Chiang
78430afca4 Merge "adb-remount-test: Refactor raw remount & remount from scratch test" 2022-09-05 03:34:56 +00:00
David Anderson
70266efc6e Merge "remount: Simplify fs_mgr_overlayfs_setup." am: 82e1fc0749
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2175953

Change-Id: I2a7ddc49a2769795ce3408d16495762b7270ddd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-03 01:08:33 +00:00
David Anderson
82e1fc0749 Merge "remount: Simplify fs_mgr_overlayfs_setup." 2022-09-03 00:28:13 +00:00
Elliott Hughes
123029cd6e Merge "Add the "sys" group for tests." am: f40607140c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2200001

Change-Id: I225a72a0551df84776801e8cbaf1d2ea71e8d20e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 22:55:47 +00:00
Elliott Hughes
f40607140c Merge "Add the "sys" group for tests." 2022-09-02 22:34:56 +00:00
Jiyong Park
2ba4ffcbf4 Merge "init: remove unnecessary semicolon" am: a5dfe700b8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2200320

Change-Id: I26da9d2c13856ab7dcfaeb5f9b6fb84f35d5c549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 12:05:30 +00:00
Jiyong Park
a5dfe700b8 Merge "init: remove unnecessary semicolon" 2022-09-02 11:39:05 +00:00
Yi-yo Chiang
538a3f0a1f Merge "adb-remount-test: Refactor fastboot flash vendor test" am: a219a2337a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2197003

Change-Id: I3ae8ec64337db21abd4f9365f88911b231705da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 11:08:13 +00:00
Yi-yo Chiang
a219a2337a Merge "adb-remount-test: Refactor fastboot flash vendor test" 2022-09-02 10:32:47 +00:00
Jooyung Han
c663694e40 Merge "Removed property init.apex.<apex-name>.load/unload." am: c69bcd4a6d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199938

Change-Id: Id60f5f46e4ee7277c21a7cc7f5684685fde6659c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 07:12:05 +00:00
Jooyung Han
c69bcd4a6d Merge "Removed property init.apex.<apex-name>.load/unload." 2022-09-02 06:46:54 +00:00
Yi-yo Chiang
38ee10284b Merge "adb-remount-test: Refactor remount RW test" am: b1e4f98b96
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2194883

Change-Id: Id637f3d685152e530aaccc3a8b217d3e404dc1bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 05:59:29 +00:00
Yi-yo Chiang
b1e4f98b96 Merge "adb-remount-test: Refactor remount RW test" 2022-09-02 05:27:21 +00:00
Yi-yo Chiang
60d19a630c Merge changes I4d388590,Id15844d8,Iec4224d8 am: a028455e9d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2194882

Change-Id: I36b37c159d8eec902fc7ce8dd6add422e71ad4c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 04:29:03 +00:00
Yi-yo Chiang
a028455e9d Merge changes I4d388590,Id15844d8,Iec4224d8
* changes:
  adb-remount-test: Discover fstab pathname more intelligently
  adb-remount-test: Reduce noise from initial overlayfs diagnostics
  adb-remount-test: Miscellaneous fixes
2022-09-02 04:06:19 +00:00
Brian Duddie
9f2af69d2a Add fdsan capabilities for native handles
Introduces new APIs which can be used to simplify application of fdsan
to native_handle_t usage, and applies fdsan protection to
native_handle_clone() by default.

Bug: 244214188
Test: validated alongside sensor service change to use the new APIs
Change-Id: I3be16a09c336bcbe880bdb542d5da2969c2c34d3
2022-09-02 00:44:13 +00:00