ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
79444 commits 1 branch 0 tags 217 MiB
Commit graph

79444 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suren Baghdasaryan
f09461e2fd Merge "init: Change extra_free_kbytes.sh to add margin relative to the default watermark level" am: 633ce78b94 am: 65a9da7612 am: c26e034424 am: 8f76cbd5f5 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2194880

Change-Id: Ic52f212b816657a23bdbaf612cab58a8ea5d8d05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 18:27:31 +00:00
Deyao Ren
c182fff76c Merge "Clean up services created after running test" am: 2880afb77f am: f71d80a154 am: 88a54e3bca am: da869fbab7 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2209900

Change-Id: I0d282266c2656af173eca534491f4ab9d3cee4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 18:13:05 +00:00
Suren Baghdasaryan
8f76cbd5f5 Merge "init: Change extra_free_kbytes.sh to add margin relative to the default watermark level" am: 633ce78b94 am: 65a9da7612 am: c26e034424 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2194880

Change-Id: Id7a7fdc6afe9794b03816830de8ebc4cd80a5781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 17:47:30 +00:00
Deyao Ren
da869fbab7 Merge "Clean up services created after running test" am: 2880afb77f am: f71d80a154 am: 88a54e3bca 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2209900

Change-Id: I40ffd1db7523e3e5ac8d18513e0ababf654a5a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 17:47:19 +00:00
Suren Baghdasaryan
c26e034424 Merge "init: Change extra_free_kbytes.sh to add margin relative to the default watermark level" am: 633ce78b94 am: 65a9da7612 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2194880

Change-Id: Ie1e77baaf7db9c9d4766f81d5e1e615ac427ccda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 17:20:15 +00:00
Deyao Ren
88a54e3bca Merge "Clean up services created after running test" am: 2880afb77f am: f71d80a154 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2209900

Change-Id: I70e1049752ad959d7704ed7790fd36c0fbddddb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 17:19:37 +00:00
Suren Baghdasaryan
65a9da7612 Merge "init: Change extra_free_kbytes.sh to add margin relative to the default watermark level" am: 633ce78b94 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2194880

Change-Id: I35745072b0108994cf084cda46dd994f9279c4a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 17:17:33 +00:00
Suren Baghdasaryan
633ce78b94 Merge "init: Change extra_free_kbytes.sh to add margin relative to the default watermark level" 2022-09-09 16:55:25 +00:00
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
905ee94942 Merge "Declare the headers of the ndk_library" am: a23b5467dc am: dad50f950b am: 37b81deefb am: bd9fdd2df2 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2211949

Change-Id: Ib34d49052b9e65b6a3676893c8448019b4bc78e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 01:51:10 +00:00
Spandan Das
bd9fdd2df2 Merge "Declare the headers of the ndk_library" am: a23b5467dc am: dad50f950b am: 37b81deefb 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2211949

Change-Id: I641e4bcf227db0ac7c84e960840a05901116df45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 01:25:13 +00:00
Spandan Das
37b81deefb Merge "Declare the headers of the ndk_library" am: a23b5467dc am: dad50f950b 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2211949

Change-Id: I7ec37d672163351fd0b50fe8755b02549100c08b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 00:55:58 +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
51749de382 Merge "vts_libsnapshot_test: Fix test flakiness." am: 0dfbdc5bdb am: 9b60fd39e5 am: 386169c320 am: 43ef6d4264 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199352

Change-Id: I2d7334cc9a4dbe055bc1eda875639dc41913526d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:56:32 +00:00
David Anderson
43ef6d4264 Merge "vts_libsnapshot_test: Fix test flakiness." am: 0dfbdc5bdb am: 9b60fd39e5 am: 386169c320 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199352

Change-Id: Ifb553dd86269b1612c412813c79e284c51c09e56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:29:07 +00:00
David Anderson
386169c320 Merge "vts_libsnapshot_test: Fix test flakiness." am: 0dfbdc5bdb am: 9b60fd39e5 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199352

Change-Id: I4ff6b8dda8f15d8ed150d41c90fcd585f8f9815d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 20:46:16 +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
Suren Baghdasaryan
cfd8864f9a init: Change extra_free_kbytes.sh to add margin relative to the default watermark level 
extra_free_kbytes.sh accepts a parameter representing the number of KB
to add to low and high watermarks. It adds this margin to the current
watermark levels, however this is not how /proc/sys/vm/extra_free_kbytes
knob that it replaces used to work. The old knob would add the margin
relative to the original and not the current level of the watermarks.
Change extra_free_kbytes.sh to add the specified margin to the original
watermark levels to act as correct replacement of the old knob.

Bug: 242837506
Fixes: 642048d969 ("init: Add extra_free_kbytes.sh script to adjust watermark_scale_factor")
Test: repeatedly run 'setprop sys.sysctl.extra_free_kbytes 30375'
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I8af603ba00bd4fb8182b80b3c0969fa96cdd7311
 2022-09-08 19:34:43 +00:00
Treehugger Robot
b14d9415ed Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: a5d944f67d am: 7ce0d570e8 am: f815fe979d am: 7c2722d33d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2210342

Change-Id: I6c0e0fa6f2456afe8ac70c3ee7168c95312833d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 19:34:41 +00:00
Treehugger Robot
7c2722d33d Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: a5d944f67d am: 7ce0d570e8 am: f815fe979d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2210342

Change-Id: I0a04b4a4dfe807b3ad7809fb68df6230156d8dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 18:49:44 +00:00
Treehugger Robot
f815fe979d Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: a5d944f67d am: 7ce0d570e8 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2210342

Change-Id: I946412ba45b2a59723fc8d6c6b52052429a150fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 18:07:27 +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
cfe0957716 Merge "Change log level in mount_with_alternatives()" am: 34386d2d29 am: 342cfadb06 am: b5732ef2f9 am: 653c664e01 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2209039

Change-Id: I0ef9f1960a5d93483941b865ed5a5d1c4c2ea658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 15:12:22 +00:00
Treehugger Robot
653c664e01 Merge "Change log level in mount_with_alternatives()" am: 34386d2d29 am: 342cfadb06 am: b5732ef2f9 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2209039

Change-Id: I1effcf5f3437d7c541c321c311cede8734e1f7f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 14:46:26 +00:00
Treehugger Robot
b5732ef2f9 Merge "Change log level in mount_with_alternatives()" am: 34386d2d29 am: 342cfadb06 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2209039

Change-Id: I2520566b8a791b7b4ad864008363be44eb002c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 14:03:30 +00:00
Sandro Montanari
f417391601 Merge "Remove /dev/selinux directory creation from first_stage_init.cpp" am: 4b3c063ac3 am: 8ee78c7c3a am: db4f04cc6b am: 35f7da7f8e 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2208840

Change-Id: I9093872db89d68a4cd76d705e9ed80b7a52500e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 13:34:44 +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
35f7da7f8e Merge "Remove /dev/selinux directory creation from first_stage_init.cpp" am: 4b3c063ac3 am: 8ee78c7c3a am: db4f04cc6b 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2208840

Change-Id: Ib03d08c4d105dad2b2cb1518883987dcfdc406d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 12:38:02 +00:00
Sandro Montanari
db4f04cc6b Merge "Remove /dev/selinux directory creation from first_stage_init.cpp" am: 4b3c063ac3 am: 8ee78c7c3a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2208840

Change-Id: I069e9509c1b83958aaff90b8a43b310badaa76f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 12:10:06 +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
Per Larsen
f8a867ddab [automerger skipped] trusty/apploader: Handle APPLOADER_ERR_NOT_ENCRYPTED am: c3bda9f3ed -s ours 
am skip reason: Merged-In Ib2a3c881015700492b8166be38c41753bf51b3b2 with SHA-1 db9a554a2f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/19881150

Change-Id: I40a8c18cd95504c4a36b6b59a2586770cd88ae60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:32:33 +00:00
Per Larsen
39004cffa4 [automerger skipped] trusty/apploader: Add missing doc for enum value am: 63818fc16d -s ours 
am skip reason: Merged-In Ia9b17f4ea705d13567b2ba74f2dcd6df5a0c7d73 with SHA-1 c5253819f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/19881149

Change-Id: Ib6be234e8b768f97090b83dfd7d4cc1e580cd5d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:32:31 +00:00
Sandro Montanari
4822fea618 Merge "Create /dev/selinux folder if it was not created by first-stage-init" am: 344f71605c am: f3ce0486e1 am: 9cd977883f am: 5f4550b833 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2203897

Change-Id: I2ed6fbb82b3d2aa3d434fa69cfc4d4c20d47729e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 17:37:06 +00:00
Sandro Montanari
5f4550b833 Merge "Create /dev/selinux folder if it was not created by first-stage-init" am: 344f71605c am: f3ce0486e1 am: 9cd977883f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2203897

Change-Id: I4be9786bc19be0d0855ee211cdb81036dcecee55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 17:09:48 +00:00
Sandro Montanari
9cd977883f Merge "Create /dev/selinux folder if it was not created by first-stage-init" am: 344f71605c am: f3ce0486e1 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2203897

Change-Id: Ica3dc3b77809801a2853a675050795bea029cc30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 16:01:18 +00: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