Commit graph

49891 commits

Author SHA1 Message Date
Mark Salyzyn
ae0c91dad4 Merge "ueventd: populate /dev/block/mapper link" am: 5c811fd01a
am: ee32edb306

Change-Id: I8278fa28d430dc17f4e45b263314643ecb27631d
2019-04-02 20:27:17 -07:00
Treehugger Robot
52c6f1b6de Merge "adb: fix mac build breakage." 2019-04-03 03:14:28 +00:00
Android Build Merger (Role)
fe018d96c0 Merge "Merge "libcutils: android_reboot command should be unsigned." am: e3ec16b9c6 am: cf2f309cff am: ba78d39cdc" 2019-04-03 02:52:39 +00:00
Elliott Hughes
15e370aced Merge "libcutils: android_reboot command should be unsigned." am: e3ec16b9c6 am: cf2f309cff
am: ba78d39cdc

Change-Id: I034c780c6c1166e4c6643ebcc607d3388246ebab
2019-04-02 19:52:28 -07:00
Elliott Hughes
bd8f02ce83 Merge "libcutils: android_reboot command should be unsigned." am: e3ec16b9c6 am: cf2f309cff
am: ba78d39cdc

Change-Id: I14687e2bd40564dab349b04dd1ca69ce112098a7
2019-04-02 19:52:24 -07:00
Mark Salyzyn
ee32edb306 Merge "ueventd: populate /dev/block/mapper link"
am: 5c811fd01a

Change-Id: I3f080cd0cfba9456dc5f1cff478dd47845cb6b19
2019-04-02 19:49:05 -07:00
Android Build Merger (Role)
af200d9bc5 Merge "[automerger skipped] Merge "Report last atom tag of the failed stats log." am: b7080aab9d am: 4f0c63c4f2 am: b3b1f10fff -s ours am skip reason: change_id I4de61a2eea393e8518cb76147598778293440a81 with SHA1 cf776d9b83 is in history" 2019-04-03 02:45:28 +00:00
yaochen
ae740d3bf6 [automerger skipped] Merge "Report last atom tag of the failed stats log." am: b7080aab9d am: 4f0c63c4f2
am: b3b1f10fff -s ours
am skip reason: change_id I4de61a2eea393e8518cb76147598778293440a81 with SHA1 cf776d9b83 is in history

Change-Id: Id47d1882263a2b47ca8bb8f2297a7db17c9cc9e2
2019-04-02 19:45:16 -07:00
yaochen
f1448a115b [automerger skipped] Merge "Report last atom tag of the failed stats log." am: b7080aab9d am: 4f0c63c4f2
am: b3b1f10fff -s ours
am skip reason: change_id I4de61a2eea393e8518cb76147598778293440a81 with SHA1 cf776d9b83 is in history

Change-Id: Ie7d8e537578bd06d1701960690ea611fca752d39
2019-04-02 19:45:01 -07:00
Treehugger Robot
5c811fd01a Merge "ueventd: populate /dev/block/mapper link" 2019-04-03 02:30:27 +00:00
Tej Singh
09989c3ebe [automerger skipped] Merge "stats_event_list changes for statsd mainline api" am: f95468d329 am: 930d04056f
am: f61390dafa -s ours
am skip reason: change_id I4163edc80ffcca61db7ab2a1e14ae8c14aab2347 with SHA1 4c2f079dad is in history

Change-Id: I2257736a6b71136cb46a415f726c46e0747d3bea
2019-04-02 19:23:10 -07:00
Vic Yang
8160c08d49 Merge "Version liblog LL-NDK library" am: 92c9e8ab7f am: 10c9004bf7
am: 6d9d411968

Change-Id: Ia626cd2248421450a2a82054d3a857cba8097062
2019-04-02 19:07:57 -07:00
Elliott Hughes
ba78d39cdc Merge "libcutils: android_reboot command should be unsigned." am: e3ec16b9c6
am: cf2f309cff

Change-Id: I15c19bc1d885fa368f2cb84fc33a79c1749f114f
2019-04-02 19:07:05 -07:00
yaochen
b3b1f10fff Merge "Report last atom tag of the failed stats log." am: b7080aab9d
am: 4f0c63c4f2

Change-Id: Idae39ddf564c5c4ffe0ac1b6eb7ebf9bcafce3ee
2019-04-02 18:51:08 -07:00
Tej Singh
f61390dafa Merge "stats_event_list changes for statsd mainline api" am: f95468d329
am: 930d04056f

Change-Id: I57b8bb3a2281c635a495cfd5d34afb5cb9f7596b
2019-04-02 18:49:49 -07:00
Elliott Hughes
cf2f309cff Merge "libcutils: android_reboot command should be unsigned."
am: e3ec16b9c6

Change-Id: Ib2b93b1a133687c2bf2ce7f486ce6c3ffba828d3
2019-04-02 18:47:51 -07:00
Vic Yang
6d9d411968 Merge "Version liblog LL-NDK library" am: 92c9e8ab7f
am: 10c9004bf7

Change-Id: If13677d5a64bae5d93d58ef81a0124e5ee3fdc7a
2019-04-02 18:41:25 -07:00
Treehugger Robot
e3ec16b9c6 Merge "libcutils: android_reboot command should be unsigned." 2019-04-03 01:19:06 +00:00
yaochen
4f0c63c4f2 Merge "Report last atom tag of the failed stats log."
am: b7080aab9d

Change-Id: I1dd7df47f782032ddf7ab1a0e325393b3a14a052
2019-04-02 18:16:20 -07:00
Tej Singh
930d04056f Merge "stats_event_list changes for statsd mainline api"
am: f95468d329

Change-Id: Ibd5d278f6af65a3c63bb97f6e5cf1b7b60180e4d
2019-04-02 18:15:12 -07:00
Vic Yang
10c9004bf7 Merge "Version liblog LL-NDK library"
am: 92c9e8ab7f

Change-Id: I1e5b4d1da1d186b8b5a7b331126a0dde2d39c48b
2019-04-02 18:06:54 -07:00
Yifan Hong
eecba5c11d CgroupSetupCgroups -> CgroupSetup
Test: builds
Bug: 123664216
Change-Id: I47c46ca9ba5c1fbf3f9f7a1b185dc48b058b1e32
2019-04-02 17:34:37 -07:00
Yifan Hong
169a3e6095 Add libcgrouprc to ld.config.*.txt.
Test: boots (sanity)
Bug: 123664216
Change-Id: I23c3ece44816e4e213f9630b915e19978a259823
2019-04-02 17:34:37 -07:00
Yifan Hong
fad638c82d libprocessgroup: use libcgrouprc to read cgroup.rc
Use the LL-NDK library to read cgroup.rc.

As a side-effect, the CgroupController class is changed
to a wrapper of ACgroupController* from the library. The
class itself essentially becomes the pointer, and can be
trivially copied. Modify all client code for this change.

Test: builds and boots
Bug: 123664216

Change-Id: I635d9885db62e82f37421f6d20f59c84a6f4cbb2
2019-04-02 17:34:37 -07:00
Yifan Hong
1a0996a308 libprocessgroup_setup: use libcgrouprc_format
Use CgroupController definition from libcgrouprc_format, not
libprocessgroup, because the wire format will be removed
from libprocessgroup later.

Bug: 123664216
Test: builds
Change-Id: If5e2301a1b65c3f6a51a1661cfeeed4e299f634e
2019-04-02 17:34:37 -07:00
Yifan Hong
bd623a4ce0 libprocessgroup: Move CgroupSetupCgroups() to libprocessgroup_setup
Only init uses SetupCgroups. This functionality is
moved from libprocessgroup to its own library, and only
init links to it.

Also, merge CgroupSetupCgroups() with CgroupMap::SetupCgroups()
because the former is just an alias of the latter, and
CgroupMap does not belong to libcgrouprc_setup.

Test: boots
Bug: 123664216
Change-Id: I941dc0c415e2b22ae663d43e30dc7a464687325e
2019-04-02 17:34:37 -07:00
Yifan Hong
d895647095 libprocessgroup: Add libcgrouprc
This module is an LL-NDK library that can be loaded by
modules that link to libprocessgroup (which is in VNDK).
This module defines APIs that reads cgroups.rc file
programatically. Internally, it uses libcgrouprc_format to
do so.

Test: builds
Bug: 123664216

Change-Id: I9c13c0528461758154e23cbab3a94ade7fb351ee
2019-04-02 17:34:37 -07:00
Yifan Hong
f4212744ed libprocessgroup: Add libcgrouprc_format
This module defines the wire format of the mmap()ed cgroup.rc
file.

Test: builds
Bug: 123664216

Change-Id: Iaf6199f759a6264590b13ca7ba6d7f576c3ed56a
2019-04-02 17:34:36 -07:00
Julien Desprez
74239ea1b1 Replace reboot-fastboot by reboot fastboot
Older host adb client do not recognize reboot-fastboot,
switch it for "adb reboot fastboot" which should be the
same.

Test: None
Bug: 117670584
Change-Id: Iec5230ca66ec18fe7d7c0ebd3f9ab9596a6e7b3c
2019-04-02 17:04:39 -07:00
Josh Gao
296ac3f024 adb: fix mac build breakage.
Bug: http://b/129786641
Test: none
Change-Id: Ibe051a0db2f912d1f7e55369e25a5bd38bf86fd5
2019-04-02 16:31:32 -07:00
yaochen
b7080aab9d Merge "Report last atom tag of the failed stats log." 2019-04-02 23:18:14 +00:00
Treehugger Robot
f95468d329 Merge "stats_event_list changes for statsd mainline api" 2019-04-02 23:18:00 +00:00
Treehugger Robot
92c9e8ab7f Merge "Version liblog LL-NDK library" 2019-04-02 23:16:22 +00:00
Mark Salyzyn
e3588d8b1b Merge "fs_mgr: remount: system is root" am: 2b8e96bd64 am: 81e08d4c98
am: a8611c0982

Change-Id: Idb6960ed813405d76a1eb7407c41d2a1cf841712
2019-04-02 15:28:19 -07:00
Josh Gao
804ffede3e Merge "adbd: demote CHECKs to warning logs." am: 16f4a033c3 am: 887e8f4bfd
am: 8cecb02a2c

Change-Id: Id2ab6435ad2953cd4bb6348fc5166a07a598832f
2019-04-02 15:27:18 -07:00
Mark Salyzyn
a8611c0982 Merge "fs_mgr: remount: system is root" am: 2b8e96bd64
am: 81e08d4c98

Change-Id: I31b0c419f36eb1019e8a981bd7a181c765d4a86f
2019-04-02 15:25:04 -07:00
Josh Gao
8cecb02a2c Merge "adbd: demote CHECKs to warning logs." am: 16f4a033c3
am: 887e8f4bfd

Change-Id: Ic950499166a3e520253eed9a18ac46671c32908c
2019-04-02 15:24:05 -07:00
Mark Salyzyn
81e08d4c98 Merge "fs_mgr: remount: system is root"
am: 2b8e96bd64

Change-Id: I09e8809aaae61706a1b92139fa8127c1a3d67ff9
2019-04-02 15:18:38 -07:00
David Anderson
e9d721e2f1 Merge "Fix device mapper name clashes on non-A/B devices." am: 97d1fccd5b am: d7874a2fa9
am: 7f724ad4e9

Change-Id: I6fb8145db60fbb27b158908e5bb40cc2120315ce
2019-04-02 15:08:58 -07:00
Nick Kralevich
eed675688d Merge "Revert "relax /system/bin directory permissions"" am: 98880af580 am: 88b15b2b7c
am: 6b38459ee5

Change-Id: I44ec7363697f52ee55284343f4f4f473b34de9ab
2019-04-02 15:05:19 -07:00
Tej Singh
a7c1ff6906 stats_event_list changes for statsd mainline api
Cherry pick to aosp.
stats_event_list changes for creating a generic api for statsd mainline
logging.

Test: builds
Test: existing logs continue to flow
Change-Id: I4163edc80ffcca61db7ab2a1e14ae8c14aab2347
Merged-In: I4163edc80ffcca61db7ab2a1e14ae8c14aab2347
(cherry picked from commit 4c2f079dad)
2019-04-02 15:01:57 -07:00
Treehugger Robot
2b8e96bd64 Merge "fs_mgr: remount: system is root" 2019-04-02 21:54:34 +00:00
Josh Gao
887e8f4bfd Merge "adbd: demote CHECKs to warning logs."
am: 16f4a033c3

Change-Id: I15d430f0296231c56bd8e2a9826e2ede962145c6
2019-04-02 14:41:26 -07:00
Josh Gao
16f4a033c3 Merge "adbd: demote CHECKs to warning logs." 2019-04-02 21:30:15 +00:00
Yao Chen
14c6db6d65 Report last atom tag of the failed stats log.
Test: manually tested with statsd

Change-Id: I4de61a2eea393e8518cb76147598778293440a81
Merged-In: I4de61a2eea393e8518cb76147598778293440a81
(cherry picked from commit cf776d9b83)
2019-04-02 14:26:01 -07:00
Mark Salyzyn
b18aba0a9f fs_mgr: remount: system is root
For devices without overlayfs and system is root (Hikey, Hikey960)
correct "/system" to "/" if that is the mount point.

Test: adb-remount-test.sh
Bug: 129720614
Change-Id: I3bdbd5ea7b70d03477055e60521d8132b486c904
2019-04-02 21:22:27 +00:00
David Anderson
7f724ad4e9 Merge "Fix device mapper name clashes on non-A/B devices." am: 97d1fccd5b
am: d7874a2fa9

Change-Id: I5ea972dd4e28dc476a49ac623fd03004c4a21ee1
2019-04-02 14:08:25 -07:00
David Anderson
d7874a2fa9 Merge "Fix device mapper name clashes on non-A/B devices."
am: 97d1fccd5b

Change-Id: Id47e289674eee3c17f0a267544e75cc48213fcb1
2019-04-02 14:05:20 -07:00
Nick Kralevich
6b38459ee5 Merge "Revert "relax /system/bin directory permissions"" am: 98880af580
am: 88b15b2b7c

Change-Id: I6781355d5502edf84dd5e493d532392b28f4aee3
2019-04-02 14:04:43 -07:00
Yao Chen
0a75f928d1 Increase the SO_SNDBUF for statsd socket.
In addition to the dgram queue size, the sender buffer size also matters.
Set it to a higher value (default is 224KB).

Test: manual
Change-Id: Ib610c1fa1eaf3c5e36f51854a2b0720f387dc1b8
2019-04-02 13:55:28 -07:00