Commit graph

69577 commits

Author SHA1 Message Date
Baligh Uddin
df36c1939b Migrate to packages/modules/StatsD/lib/*
BUG: 167962588
Test: TH
Merged-In: I8b7766377d21e229fbc795d9e997cac99eb39942
Change-Id: Ieff49207399029fde57c088cf5ac798983eaf080
2020-12-10 05:44:01 +00:00
Xin Li
8a1a30e93d [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: f96f8e8c7f -s ours am: 203e24713a -s ours am: e3555bf456 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b7766377d21e229fbc795d9e997cac99eb39942
2020-12-10 03:59:00 +00:00
Xin Li
e3555bf456 [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: f96f8e8c7f -s ours am: 203e24713a -s ours
am skip reason: Change-Id Id57384c385a6d0bc931caf1054812a469daa9ed0 with SHA-1 3401909e7c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3a2382a7b9266bff658085b8a32e310e2556aa1
2020-12-10 03:47:00 +00:00
Xin Li
203e24713a [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: f96f8e8c7f -s ours
am skip reason: Change-Id Id57384c385a6d0bc931caf1054812a469daa9ed0 with SHA-1 3401909e7c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07aafe66452d86a6e2f96c02e8b0c8fda583a162
2020-12-10 03:05:41 +00:00
Xin Li
f96f8e8c7f Merge "DO NOT MERGE - Merge Android R QPR1" 2020-12-10 02:18:27 +00:00
Xin Li
c30533a761 DO NOT MERGE - Merge Android R QPR1
Bug: 172690556
Merged-In: Id57384c385a6d0bc931caf1054812a469daa9ed0
Change-Id: I22db7e344a9a96bfc16e009624b4896625306e83
2020-12-09 17:44:05 -08:00
Yifan Hong
fedfd39720 Merge changes from topic "readonly_generic_ramdisk" am: 696882455b am: 3401909e7c am: 6c9f509cdb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1519823

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19c9b5e3aff01395f4446b00828ac419716180b8
2020-12-09 20:55:45 +00:00
Treehugger Robot
ad759550cd Merge "Add erofs to supported fs type" am: 8571b76185 am: 2ecb2e9f26 am: ff957f83b0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1517501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I651a6397296021da20b4236c3e385965dcc320a6
2020-12-09 20:55:27 +00:00
Elliott Hughes
e163e98403 Merge "Use freecon() with getcon()/getfilecon()." am: 2acdc9de33 am: ebcf0925fc am: 93f97df267
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1521162

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebfeabe61b9d45c7bb607e7006d728e23351363a
2020-12-09 20:53:02 +00:00
Yifan Hong
6c9f509cdb Merge changes from topic "readonly_generic_ramdisk" am: 696882455b am: 3401909e7c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1519823

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I696a169b18eb038958dafa45f63cd9a5528456c0
2020-12-09 20:42:04 +00:00
Treehugger Robot
ff957f83b0 Merge "Add erofs to supported fs type" am: 8571b76185 am: 2ecb2e9f26
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1517501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I386043c4ef31e5f0239bd0818725e3d5791554ed
2020-12-09 20:41:58 +00:00
Elliott Hughes
93f97df267 Merge "Use freecon() with getcon()/getfilecon()." am: 2acdc9de33 am: ebcf0925fc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1521162

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaae3f3c53604eb9fc24a83b49516b75c29490372
2020-12-09 20:40:06 +00:00
Yifan Hong
3401909e7c Merge changes from topic "readonly_generic_ramdisk" am: 696882455b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1519823

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id57384c385a6d0bc931caf1054812a469daa9ed0
2020-12-09 20:29:58 +00:00
Treehugger Robot
2ecb2e9f26 Merge "Add erofs to supported fs type" am: 8571b76185
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1517501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b80de12a663a61a83232fce701802e9089eb5b7
2020-12-09 20:29:26 +00:00
Elliott Hughes
ebcf0925fc Merge "Use freecon() with getcon()/getfilecon()." am: 2acdc9de33
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1521162

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I023300186b76bba84632d278e454987688a9b325
2020-12-09 20:22:29 +00:00
Yifan Hong
696882455b Merge changes from topic "readonly_generic_ramdisk"
* changes:
  Add /metadata to ramdisk.
  Also create dirs under /first_stage_ramdisk for GKI.
  Refactor the list of empty dirs in ramdisk in its own list.
  Revert "Move e2fsck into /first_stage_ramdisk."
2020-12-09 19:46:17 +00:00
Treehugger Robot
8571b76185 Merge "Add erofs to supported fs type" 2020-12-09 19:16:40 +00:00
Elliott Hughes
2acdc9de33 Merge "Use freecon() with getcon()/getfilecon()." 2020-12-09 19:03:16 +00:00
Treehugger Robot
80f2e5fe2e Merge "Add Android Studio Emulator team mebers to OWNERS" am: 25f322d353 am: e495bce0af am: ddbea61525
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1520759

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If684864b41ccf556bd89773e0b70c65df61d3cbe
2020-12-09 18:01:06 +00:00
Treehugger Robot
ddbea61525 Merge "Add Android Studio Emulator team mebers to OWNERS" am: 25f322d353 am: e495bce0af
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1520759

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c18a6e665b8e6f2d6e87433e1c0f7325cf9249f
2020-12-09 17:33:15 +00:00
Treehugger Robot
e495bce0af Merge "Add Android Studio Emulator team mebers to OWNERS" am: 25f322d353
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1520759

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03ba9f0325f7e99d57a310c6f3c7b1820b52821e
2020-12-09 17:15:17 +00:00
Treehugger Robot
25f322d353 Merge "Add Android Studio Emulator team mebers to OWNERS" 2020-12-09 16:46:02 +00:00
Tom Cherry
706d750747 Merge "ueventd: add no_fnm_pathname option" am: 6cf3695502 am: a95f900d69 am: 26ff6deb67
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1518705

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6fbed660a50e3e112e38a74702ccf2b20bcee48
2020-12-09 16:44:05 +00:00
Tom Cherry
4f9223f7e5 Merge "ueventd: add the import option from the init parser" am: 0608e36fb9 am: 877e2374a7 am: 1597ec0ac5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1520220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7798eda67b201610767e7e00c28b396104b49b27
2020-12-09 16:43:53 +00:00
Tom Cherry
26ff6deb67 Merge "ueventd: add no_fnm_pathname option" am: 6cf3695502 am: a95f900d69
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1518705

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e6ecd974922ef6a5b26cd722860d59d8032b62f
2020-12-09 16:19:06 +00:00
Tom Cherry
1597ec0ac5 Merge "ueventd: add the import option from the init parser" am: 0608e36fb9 am: 877e2374a7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1520220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5983dc88d2dc8f4225b168969e25f9f969f71c55
2020-12-09 16:18:55 +00:00
Tom Cherry
a95f900d69 Merge "ueventd: add no_fnm_pathname option" am: 6cf3695502
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1518705

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bf82b3439e15e282bef89a9ecc40663796006f6
2020-12-09 16:06:38 +00:00
Tom Cherry
877e2374a7 Merge "ueventd: add the import option from the init parser" am: 0608e36fb9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1520220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia115083bd6f688a285368949ec8adbbdd322a816
2020-12-09 16:06:15 +00:00
Tom Cherry
6cf3695502 Merge "ueventd: add no_fnm_pathname option" 2020-12-09 15:50:16 +00:00
Tom Cherry
0608e36fb9 Merge "ueventd: add the import option from the init parser" 2020-12-09 15:47:25 +00:00
Elliott Hughes
d92c6a12da Use freecon() with getcon()/getfilecon().
Bug: https://issuetracker.google.com/175090444
Test: treehugger
Change-Id: Ia2b8102f1c9a4fd56ec1ff026ba5b4f375102b9b
2020-12-08 22:30:17 -08:00
Nikita Ioffe
01473e192e [automerger skipped] Merge "Fix potential use-after-free bug in reboot" into rvc-dev am: 03ad58468b am: 93065fbab6 am: bcf476dece -s ours am: 5326e658e0 -s ours
am skip reason: Change-Id I73ecd7a8c58c2ec3732934c595b7f7db814b7034 with SHA-1 71bd926bf0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf3e55955f703a3e0d9e0c9ee1f124ab00ef0eda
2020-12-09 01:22:05 +00:00
Nikita Ioffe
5326e658e0 [automerger skipped] Merge "Fix potential use-after-free bug in reboot" into rvc-dev am: 03ad58468b am: 93065fbab6 am: bcf476dece -s ours
am skip reason: Change-Id I73ecd7a8c58c2ec3732934c595b7f7db814b7034 with SHA-1 7ba5030dcc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2203e82bf185931a045362d0f0fa00b2d6af680d
2020-12-09 00:55:03 +00:00
Nikita Ioffe
a720f3f636 [automerger skipped] Merge "Fix potential use-after-free bug in reboot" into rvc-dev am: 03ad58468b am: 995db46b89 -s ours
am skip reason: Change-Id I73ecd7a8c58c2ec3732934c595b7f7db814b7034 with SHA-1 7ba5030dcc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b1eb08dc44804b2c046a228719a1bd937e7ed2e
2020-12-09 00:23:52 +00:00
Nikita Ioffe
bcf476dece Merge "Fix potential use-after-free bug in reboot" into rvc-dev am: 03ad58468b am: 93065fbab6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/13144438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I895a5a170c60da26aacdbf869ea14b6d6db4dd67
2020-12-09 00:23:38 +00:00
Roman Kiryanov
d61738e8f1 Add Android Studio Emulator team mebers to OWNERS
qemu_pipe is an Android Studio Emulator (aka goldfish)
implementation detail.

Bug: 175046060
Test: none
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I7a80cdf1a2cd6b5af0d9544648b9d25e6abf9fad
2020-12-08 16:08:59 -08:00
Nikita Ioffe
995db46b89 Merge "Fix potential use-after-free bug in reboot" into rvc-dev am: 03ad58468b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/13144438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I536a324182f70725a5fda0c36f7f9d4676fd49b9
2020-12-09 00:07:33 +00:00
Nikita Ioffe
93065fbab6 Merge "Fix potential use-after-free bug in reboot" into rvc-dev am: 03ad58468b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/13144438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec73de951c44463d72f9af3b236644c04c6de689
2020-12-09 00:06:38 +00:00
Nikita Ioffe
03ad58468b Merge "Fix potential use-after-free bug in reboot" into rvc-dev 2020-12-08 23:42:42 +00:00
Tom Cherry
5b271797de ueventd: add the import option from the init parser
Vendors have an interest in importing ueventd files based on certain
property values.  Instead of baking this logic in the ueventd binary,
add the import option from the init parser to the ueventd parser, to
allow vendors to expand as needed.

Test: imported files are parsed
Change-Id: I674987fd48f3218e4703528c6d905b1afb5fb366
2020-12-08 13:21:26 -08:00
Yifan Hong
a3f8373043 Add /metadata to ramdisk.
Now that GKI may not be writeable, also create /metadata at build time
to avoid error log at boot time.

Note that this also creates /first_stage_ramdisk/metadata in GKI.

[    1.891172] init: [libfs_mgr]check_fs():
mount(/dev/block/by-name/metadata,/metadata,ext4)=-1: No such
file or directory

Bug: 173425293
Test: boots

Change-Id: I62d23c382ed1ad165c1d6598b3df41bd92206733
2020-12-08 12:42:55 -08:00
Yifan Hong
55326187ab Also create dirs under /first_stage_ramdisk for GKI.
If the device uses GKI and generic ramdisk, also create
empty directories under /first_stage_ramdisk so that they
won't have to be created at runtime. This allows generic
ramdisk to be not writable.

Test: boots
Bug: 173425293
Change-Id: If987cb1d4af9f9ee94a43a4523f9e1465b01b16a
2020-12-08 12:42:55 -08:00
Yifan Hong
63be35649a Refactor the list of empty dirs in ramdisk in its own list.
Test: build and manual inspect
Bug: 173425293
Change-Id: I7805640af314b60801cc831f1d1f25820f0fb63b
2020-12-08 12:42:55 -08:00
Yifan Hong
addbafdb0b Revert "Move e2fsck into /first_stage_ramdisk."
This reverts commit 3337e782e6.

Reason for revert: e2fsck is moved into vendor ramdisk and installed
to / or /first_stage_ramdisk depending on the device, so there is no
need to move it.

Bug: 173425293
Change-Id: I1eb431e6b2a1e0ba7d0da0278d076b6682a0156d
Test: boots
2020-12-08 12:42:55 -08:00
Treehugger Robot
7e2ca7e003 Merge "ueventd: Add support for updating permissions on bind" am: bca7bfcc54 am: c6544c9246 am: 37476f59d2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1511048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10d500b420a5456b2f56474eea442b2f1874e791
2020-12-08 20:35:18 +00:00
Treehugger Robot
37476f59d2 Merge "ueventd: Add support for updating permissions on bind" am: bca7bfcc54 am: c6544c9246
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1511048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a3117112a572d6121a6630819518f3e3211676f
2020-12-08 19:59:10 +00:00
Treehugger Robot
c6544c9246 Merge "ueventd: Add support for updating permissions on bind" am: bca7bfcc54
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1511048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35eb904d1129938662b7bbaa32e7c02a4addfb7e
2020-12-08 19:38:35 +00:00
Treehugger Robot
bca7bfcc54 Merge "ueventd: Add support for updating permissions on bind" 2020-12-08 18:53:44 +00:00
Tom Cherry
47031c8c88 ueventd: add no_fnm_pathname option
If a `*` appears within (but not at the end) of a /dev or /sys path in
a ueventd.rc file, then that path is matched with fnmatch() using the
FNM_PATHNAME, which means `*` will not match `/`.  That is not always
the intended behavior and this change creates the no_fnm_pathname
option, which will not use the FNM_PATHNAME flag and will have `*`
match `/`.

Bug: 172880724
Test: these unit tests
Change-Id: I85b813d89237dbf3af47564e5cbf6806df5d412f
2020-12-07 14:58:19 -08:00
Treehugger Robot
905a0d7506 Merge "Make libcutils' thread local stuff more clearly deprecated." am: 77692aeea2 am: f512b499b8 am: a97067d31a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1515640

Change-Id: Ic95727b1508f0b7b46b89bfb0ea041ba0b2b704f
2020-12-07 19:20:42 +00:00