Mikhail Naganov
10bb961bf4
Merge "libutils: Fix thread safety annotations in Mutex" am: f8fe94e546 am: 8105c31189
...
am: cce9c65f53
2019-03-29 16:48:37 -07:00
Mikhail Naganov
cce9c65f53
Merge "libutils: Fix thread safety annotations in Mutex" am: f8fe94e546
...
am: 8105c31189
2019-03-29 16:26:23 -07:00
Mikhail Naganov
8105c31189
Merge "libutils: Fix thread safety annotations in Mutex"
...
am: f8fe94e546
2019-03-29 15:51:21 -07:00
Mikhail Naganov
f8fe94e546
Merge "libutils: Fix thread safety annotations in Mutex"
2019-03-29 22:28:01 +00:00
Elliott Hughes
d4952191e4
Merge "BSD grep: sync with upstream." am: a42823b264 am: 1a420368d8
...
am: 0b2474d84f
2019-03-29 13:39:41 -07:00
Suren Baghdasaryan
f33436d720
Merge "Set /proc/pressure/memory file permissions" am: 3cf9850cef am: e337910a35
...
am: d8a1ee860c
2019-03-29 13:36:57 -07:00
Elliott Hughes
0b2474d84f
Merge "BSD grep: sync with upstream." am: a42823b264
...
am: 1a420368d8
2019-03-29 13:25:00 -07:00
Elliott Hughes
1a420368d8
Merge "BSD grep: sync with upstream."
...
am: a42823b264
2019-03-29 13:16:33 -07:00
Suren Baghdasaryan
d8a1ee860c
Merge "Set /proc/pressure/memory file permissions" am: 3cf9850cef
...
am: e337910a35
2019-03-29 13:12:13 -07:00
Suren Baghdasaryan
e337910a35
Merge "Set /proc/pressure/memory file permissions"
...
am: 3cf9850cef
2019-03-29 12:56:19 -07:00
Treehugger Robot
a42823b264
Merge "BSD grep: sync with upstream."
2019-03-29 19:46:17 +00:00
Suren Baghdasaryan
3cf9850cef
Merge "Set /proc/pressure/memory file permissions"
2019-03-29 19:38:31 +00:00
Mikhail Naganov
e1a285ddc1
libutils: Fix thread safety annotations in Mutex
...
The annotations for Mutex::tryLock and timedLock were
incorrectly specifying the return value for the successful
acquisition.
Test: make libutils_test
Change-Id: I9729b6555ede5cb1d6db046e33c35bf5926c7755
2019-03-29 12:21:57 -07:00
Bernie Innocenti
cc347b9d4e
Merge "Disallow operator!() on unique_fd" am: 0a887aa14c am: c730327691
...
am: ba394579cb
2019-03-28 21:31:39 -07:00
Bernie Innocenti
ba394579cb
Merge "Disallow operator!() on unique_fd" am: 0a887aa14c
...
am: c730327691
2019-03-28 21:15:11 -07:00
Bernie Innocenti
c730327691
Merge "Disallow operator!() on unique_fd"
...
am: 0a887aa14c
2019-03-28 21:09:00 -07:00
Treehugger Robot
0a887aa14c
Merge "Disallow operator!() on unique_fd"
2019-03-29 03:52:46 +00:00
Tim Murray
1504cb5b6e
Set /proc/pressure/memory file permissions
...
Change access mode and ownership for /proc/pressure/memory file
to allow system components access memory pressure information.
Bug: 129476847
Change-Id: I25b6bc9d47aee857936f050b66e7bee6363b53be
Signed-off-by: Tim Murray <timmurray@google.com>
2019-03-28 22:12:06 +00:00
Elliott Hughes
720c1ecc90
BSD grep: sync with upstream.
...
No significant changes, but this does get rid of our local modifications.
Bug: http://b/129089665
Test: builds
Change-Id: Ie6e3cc2198c302fc998fe6fcf027661e5dca88f0
2019-03-28 14:29:00 -07:00
Nick Kralevich
8f1e95e03e
Merge "zip_writer.cc: update powerof2 and use it unconditionally" am: b86e248e8b am: 0fd9adf747
...
am: 707d0b6da5
2019-03-28 14:04:15 -07:00
Josh Gao
2a1fb09335
Merge "adbd: wait for FUNCTIONFS_BIND for up to a second, then retry." am: bfcb981b32 am: 80268fd592
...
am: 51ca488977
2019-03-28 14:02:31 -07:00
Nick Kralevich
707d0b6da5
Merge "zip_writer.cc: update powerof2 and use it unconditionally" am: b86e248e8b
...
am: 0fd9adf747
2019-03-28 13:52:24 -07:00
Josh Gao
51ca488977
Merge "adbd: wait for FUNCTIONFS_BIND for up to a second, then retry." am: bfcb981b32
...
am: 80268fd592
2019-03-28 13:50:57 -07:00
Nick Kralevich
0fd9adf747
Merge "zip_writer.cc: update powerof2 and use it unconditionally"
...
am: b86e248e8b
2019-03-28 13:38:44 -07:00
Josh Gao
80268fd592
Merge "adbd: wait for FUNCTIONFS_BIND for up to a second, then retry."
...
am: bfcb981b32
2019-03-28 13:37:41 -07:00
Nick Kralevich
b86e248e8b
Merge "zip_writer.cc: update powerof2 and use it unconditionally"
2019-03-28 20:23:00 +00:00
Josh Gao
bfcb981b32
Merge "adbd: wait for FUNCTIONFS_BIND for up to a second, then retry."
2019-03-28 19:53:29 +00:00
Mark Salyzyn
0fef28fbd1
Merge "init: mount_handler: system-as-root (legacy)" am: a896e2aee5 am: 7bf190aa32
...
am: 6ecebbf94f
2019-03-28 12:03:14 -07:00
Mark Salyzyn
6ecebbf94f
Merge "init: mount_handler: system-as-root (legacy)" am: a896e2aee5
...
am: 7bf190aa32
2019-03-28 11:45:38 -07:00
Mark Salyzyn
7bf190aa32
Merge "init: mount_handler: system-as-root (legacy)"
...
am: a896e2aee5
2019-03-28 11:37:20 -07:00
Treehugger Robot
a896e2aee5
Merge "init: mount_handler: system-as-root (legacy)"
2019-03-28 18:25:27 +00:00
Suren Baghdasaryan
9294e989b4
Merge "libprocessgroup: restrict SetupCgroups to one-time usage and only by init" am: 81cfeb54fc am: f5b778131b
...
am: bb07f38278
2019-03-28 10:36:52 -07:00
Suren Baghdasaryan
bb07f38278
Merge "libprocessgroup: restrict SetupCgroups to one-time usage and only by init" am: 81cfeb54fc
...
am: f5b778131b
2019-03-28 10:30:11 -07:00
Suren Baghdasaryan
f5b778131b
Merge "libprocessgroup: restrict SetupCgroups to one-time usage and only by init"
...
am: 81cfeb54fc
2019-03-28 10:25:25 -07:00
Suren Baghdasaryan
81cfeb54fc
Merge "libprocessgroup: restrict SetupCgroups to one-time usage and only by init"
2019-03-28 17:13:09 +00:00
Martin Stjernholm
d2c8014b13
Merge "Apply the standard system linker config to all of /data." am: 60de348654 am: 0ec4836b71
...
am: e7540ff272
2019-03-28 05:59:01 -07:00
Martin Stjernholm
e7540ff272
Merge "Apply the standard system linker config to all of /data." am: 60de348654
...
am: 0ec4836b71
2019-03-28 05:54:18 -07:00
Martin Stjernholm
0ec4836b71
Merge "Apply the standard system linker config to all of /data."
...
am: 60de348654
2019-03-28 05:50:11 -07:00
Martin Stjernholm
60de348654
Merge "Apply the standard system linker config to all of /data."
2019-03-28 12:37:29 +00:00
David Anderson
4b519dc9ba
Merge "init: Support booting off GSIs installed to non-userdata block devices." am: 5aa37dc3dc am: 34a9f9e204
...
am: f8fad9d9c9
2019-03-28 03:21:46 -07:00
David Anderson
f8fad9d9c9
Merge "init: Support booting off GSIs installed to non-userdata block devices." am: 5aa37dc3dc
...
am: 34a9f9e204
2019-03-28 03:08:27 -07:00
David Anderson
34a9f9e204
Merge "init: Support booting off GSIs installed to non-userdata block devices."
...
am: 5aa37dc3dc
2019-03-28 02:59:43 -07:00
David Anderson
5aa37dc3dc
Merge "init: Support booting off GSIs installed to non-userdata block devices."
2019-03-28 09:46:44 +00:00
Dimitry Ivanov
f6fd41c423
Merge "Add dependency on libdl_android"
2019-03-28 09:05:53 +00:00
Bernie Innocenti
7cb72c96b4
Disallow operator!() on unique_fd
...
This catches a common mistake where client code checks for errors using
the common idiom that works for std::iostream and other file-like
classes:
unique_fd fd = open(...);
if (!fd) {
}
Test: atest libbase_test
Test: m droid
Change-Id: I9629a7795537ecb3b57be9c741c06f80967e4cc2
2019-03-28 15:56:07 +09:00
Suren Baghdasaryan
5b53573671
libprocessgroup: restrict SetupCgroups to one-time usage and only by init
...
SetupCgroups is called by init process during early-init stage and is not
supposed to be called again by anyone else. Ensure that the caller is the
init process, make sure cgroup.rc file is written only one time, keep the
file descriptor to cgroup.rc file open by the init process to ensure all
its further mappings stay valid even if the file is deleted.
Bug: 124774415
Test: build, run, verify no errors or warning in the logcat
Change-Id: Ib8822cf0112db7744e28d442182d54dcf06f46f2
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-03-28 01:25:22 +00:00
Victor Hsieh
c4430f3489
Merge "Initialize fs-verity keys in shell script" am: 7f43e9fa40 am: ef787edd24
...
am: 98d7696248
2019-03-27 13:51:14 -07:00
Mark Salyzyn
793f4b503e
init: mount_handler: system-as-root (legacy)
...
On marlin, dev.mnt.blk.root is empty. Issue is shared for all
devices that are system-as-root.
/dev/root /proc/mounts entry exists before the associated block device
is instantiated by ueventd. As a result when the device shows up the
root mount is updated late when the next mount inotify trigger occurs,
delay which we will accept. But the property entries are added before
removed in the loop which causes the ultimate property entry for root
to report empty. Add /dev/block/dm-0, remove /dev/root, for property
dev.mnt.blk.root.
Fix is to change to Remove before Adding. Remove /dev/root, then add
/dev/block/dm-0.
On system-as-root as well, can not just use fstab. Determine if a
dm-verity reference is wrapped around system and use that instead.
Add some additional filtration of loop and APEX mounts to reduce
property noise.
Fix issue with creating the std:string line holder from getline(3).
Test: manual on marlin
Bug: 124072565
Change-Id: Ief2e1a6f559cbcbc87273fc2db35c675bb972f43
2019-03-27 20:50:39 +00:00
Victor Hsieh
98d7696248
Merge "Initialize fs-verity keys in shell script" am: 7f43e9fa40
...
am: ef787edd24
2019-03-27 13:47:01 -07:00
Victor Hsieh
ef787edd24
Merge "Initialize fs-verity keys in shell script"
...
am: 7f43e9fa40
2019-03-27 13:40:10 -07:00
