Commit graph

1242 commits

Author SHA1 Message Date
Nick Kralevich
715e33452e init.rc: delete extra whitespace
causes merge conflicts.

Test: none
Change-Id: Ic83db2b3e2f972955efadfc8df8fe8ec918a7609
2016-11-19 16:07:40 -08:00
Paul Lawrence
0705fcb2f4 Merge "Add flags to restorecon_recursive to traverse filesystems" am: 5fbd1cfd34 am: ffa3689107 am: a99490c813
am: e799e3317a

Change-Id: Icd4b867d450c7b84f86f9d91b39faf6792544cb1
2016-11-17 18:30:22 +00:00
Paul Lawrence
ffa3689107 Merge "Add flags to restorecon_recursive to traverse filesystems"
am: 5fbd1cfd34

Change-Id: I539d7e9d441c7bb3f5602b892408a85436b857e8
2016-11-17 17:55:06 +00:00
Paul Lawrence
a8d8434c42 Add flags to restorecon_recursive to traverse filesystems
Use to solve the problem of tracefs conditionally being mounted
under debugfs and needing restorecon'd without boot performance
penalty.

Also move skip-ce to a flag for consistency.

Test: Check that trace_mount has correct attributes after boot
Bug: 32849675
Change-Id: Ib6731f502b6afc393ea5ada96fa95b339f14da49
2016-11-16 22:27:45 +00:00
Tianjie Xu
c488087aa0 Start update_verifier in cache group
Start update_verifier in cache group to avoid dac_override

Bug: 30020920
Change-Id: I227b4a0e1c07e7b9bf209b432e9db02275ffe660
Test: mma
(cherry picked from commit 1e4635f0a8)
2016-11-09 11:57:26 -08:00
Sandeep Patil
cb221cee18 Merge changes from topic 'healthd-charger-split'
* changes:
  healthd: refactor healthd code to split into 'charger' and 'healthd'
  healthd: build 'charger' and 'healthd' binaries
  healthd: refactor to split charger and framework facing code
2016-11-08 23:45:15 +00:00
Sandeep Patil
6012db553c healthd: build 'charger' and 'healthd' binaries
This renames the old '/sbin/healthd' to '/sbin/charger'
which is to be only used in recovery and charger-only mode.

.. and adds a new dynamically linked executable in /system/bin/healthd
to be used as 'healthd' in Android.

   text    data     bss     dec     hex filename
 817404   36704   37960  892068   d9ca4 root/sbin/charger {was healthd}
  72717   11064   12984   96765   179fd system/bin/healthd {*new*}
 890121   47768   50944  988833   f16a1 (TOTALS)

Corresponding changes in recovery and charger-only .rc files are
required change how 'charger' is launched in each mode.

Update the seclable for healthd with the launch path in init.rc

Test: Boot tested and verified all 3 modes (recovery, charge-only,
android)

Change-Id: I4ada27a4c113258c5be1fd10adb0f58232b10024
Signed-off-by: Sandeep Patil <sspatil@google.com>
2016-11-08 07:36:07 -08:00
Paul Lawrence
ef2479247d Merge "Fix selinux warning on tracefs systems" am: 0ad600bdc6 am: 3915012a46 am: 67387a3510
am: a0d26e7cdd

Change-Id: I004165050ab96c3a9a7f1fbcdadf84c22b8256d9
2016-11-07 15:22:23 +00:00
Paul Lawrence
3915012a46 Merge "Fix selinux warning on tracefs systems"
am: 0ad600bdc6

Change-Id: Ibaab6580caf0fe216cfae72bf5d2560fec02afdf
2016-11-07 15:07:22 +00:00
Paul Lawrence
d2abcbd0ab Fix selinux warning on tracefs systems
restorecon_recursive doesn't traverse filesystem boundaries. On
tracefs systems, tracing is a separate filesystem, so restorecon
this as well

Bug: 30963384
Test: Boot hikey, and check that there are no debugfs_tracing denials in dmesg
Change-Id: I24abd3ad80d2cfdab4f64fecee799fc0c24ed238
2016-11-04 10:56:06 -07:00
Steven Moreland
f8f334966d Merge "Update for hidlized hwservicemanager." am: 480af3f633 am: 82c67f5662 am: b394786624
am: 0c54c1e8d6

Change-Id: I8a186016e14aa4137233fc97f949b14bac7f19cd
2016-11-02 22:38:35 +00:00
Steven Moreland
82c67f5662 Merge "Update for hidlized hwservicemanager."
am: 480af3f633

Change-Id: I2c11b0249ab77e9dc22a76f6aa66026ebf3ed00d
2016-11-02 22:23:56 +00:00
Steven Moreland
ba825ac33f Update for hidlized hwservicemanager.
Bug: 32313592
Test: end to end
Change-Id: I76a7ee01413b28e95e9f19fcde90f6372502ec67
2016-11-02 13:29:34 -07:00
Iliyan Malchev
1797eb1f09 init.rc: have hwservicemanager start the HAL class am: 57d66b8447 am: ad0cbcf21c am: f0099ccb23
am: 121fe849e8

Change-Id: I6cba53d417d505b56e8294afaad473399f692beb
2016-09-27 00:22:46 +00:00
Iliyan Malchev
121fe849e8 init.rc: have hwservicemanager start the HAL class am: 57d66b8447 am: ad0cbcf21c
am: f0099ccb23

Change-Id: I5c24ecbf89d723c478a02bcab8cffc4e9e4385e9
2016-09-27 00:16:50 +00:00
Iliyan Malchev
57d66b8447 init.rc: have hwservicemanager start the HAL class
b/31458381
Test: passing build and runtime tests

Change-Id: I1d26af5ca1d0e9c7bbd97cfd88d0b432b50b7216
Signed-off-by: Iliyan Malchev <malchev@google.com>
2016-09-26 00:23:51 -07:00
Ajay Panicker
ac657cd0d2 Merge "Remove net_bt_stack group and replace it with bluetooth" am: 7875407bb7 am: f924c252bd am: b0db9714bb
am: 531b201eb6

Change-Id: Ie822dd8f259f240eb457f5d67948c417f84817c6
2016-09-23 00:04:45 +00:00
Ajay Panicker
531b201eb6 Merge "Remove net_bt_stack group and replace it with bluetooth" am: 7875407bb7 am: f924c252bd
am: b0db9714bb

Change-Id: I025c5301fecf0566d8184efce099a195fdbfc460
2016-09-22 21:58:27 +00:00
Ajay Panicker
604208e957 Remove net_bt_stack group and replace it with bluetooth
Bug: 31549206
Change-Id: I667963e5f9fd1a5dc9ad74378b318e3b782e6883
2016-09-20 12:01:33 -07:00
Ajay Panicker
35a0ef524b Merge "Allow bluetooth service to access bluetooth directory and add /logs (1/6)" am: 2c2a3f7a95 am: 3a9a16ee79 am: f5ffb20e6f
am: bf2b7a93b2

Change-Id: Iac994fa66eeb7b4e84cd72891ff7449bb51f9da3
2016-09-20 03:25:22 +00:00
Ajay Panicker
bf2b7a93b2 Merge "Allow bluetooth service to access bluetooth directory and add /logs (1/6)" am: 2c2a3f7a95 am: 3a9a16ee79
am: f5ffb20e6f

Change-Id: Ied3f4a26681d0c1e3bd72d4f1d0de77fa9e7803a
2016-09-19 20:26:21 +00:00
Ajay Panicker
59d6a8cf8a Allow bluetooth service to access bluetooth directory and add /logs (1/6)
Bug: 31466840
Change-Id: I2c2766a2366600def81708d97cf3f3f13e0eb655
2016-09-19 17:50:56 +00:00
Wei Wang
d61a7e2da4 Split fstab mount into 2 phases
This will make it possible to start some key services before mounting
data partition

Bug: 30118894
Change-Id: Ia9f8cc035de6cc0df9a61605864915efa0266d7f
(cherry picked from commit abfbec342f)
2016-09-06 21:04:26 +00:00
Wei Wang
254f44363b Split fstab mount into 2 phases
This will make it possible to start some key services before mounting
data partition

(cherry picked from commit abfbec342f)

Bug: 30118894
Change-Id: Ia9f8cc035de6cc0df9a61605864915efa0266d7f
2016-09-06 11:39:05 -07:00
Wei Wang
abfbec342f Split fstab mount into 2 phases
This will make it possible to start some key services before mounting
data partition

Bug: 30118894
Change-Id: Ia9f8cc035de6cc0df9a61605864915efa0266d7f
2016-09-02 18:11:06 -07:00
Tianjie Xu
7edd3146c7 Merge \\"Start update_verifier in cache group\\" into nyc-mr1-dev am: eddde7a130
am: 872b6e8790

Change-Id: Iac20bb4571292da8b783de8185dff93dc04850b9
2016-07-14 23:06:49 +00:00
Tianjie Xu
872b6e8790 Merge \"Start update_verifier in cache group\" into nyc-mr1-dev
am: eddde7a130

Change-Id: Ia17697a852687f319050a8cf260316f522564085
2016-07-14 22:43:16 +00:00
Tianjie Xu
eddde7a130 Merge "Start update_verifier in cache group" into nyc-mr1-dev 2016-07-14 22:27:08 +00:00
Pat Tjin
5408a76637 Merge \\"core/init.rc: Add /data/cache/* directory creation\\" into nyc-mr1-dev am: 46066ef405
am: b05988b33a

Change-Id: Iae9bc319eaad99364b59772260867fb90b08eeae
2016-07-14 19:23:27 +00:00
Yueyao (Nathan) Zhu
b05988b33a Merge \"core/init.rc: Add /data/cache/* directory creation\" into nyc-mr1-dev
am: 46066ef405

Change-Id: Id67c7a2177520da1f3848642a68442c55b4f863d
2016-07-14 18:34:21 +00:00
Pat Tjin
46066ef405 Merge "core/init.rc: Add /data/cache/* directory creation" into nyc-mr1-dev 2016-07-14 18:28:51 +00:00
Tianjie Xu
1e4635f0a8 Start update_verifier in cache group
Start update_verifier in cache group to avoid dac_override

Bug: 30020920
Change-Id: I227b4a0e1c07e7b9bf209b432e9db02275ffe660
2016-07-12 18:31:17 -07:00
Tim Murray
e43d1d523e Merge \\"Add support for background stune group.\\" into nyc-mr1-dev am: 531bdd5a2c
am: b386d72266

Change-Id: Ib0e2efeef7e015e0e8244e29a825bf3da50297a8
2016-07-12 02:46:06 +00:00
Irina Patru
51dcc811dc Merge \\"init.rc: Remove cpu weight set on the root cgroup\\" into nyc-mr1-dev am: ac957cbd72
am: ddb0f3c612

Change-Id: Ia872bcedde94c70dadc2c3a4e69e2d5cd375c28f
2016-07-12 02:46:05 +00:00
Tim Kryger
1af798ddc5 Merge \\\\"Remove attempt to write sched_compat_yield\\\\" am: 3f2db32b8c am: 49a986bf73 am: f789bd0133
am: 3886aaeae4

Change-Id: I6da3999160ca054e0d8e819e4b35420ae19507c7
2016-07-12 02:46:05 +00:00
Tim Murray
17b1c0c061 Merge changes from topic \\'stune\\' into nyc-mr1-dev am: 4b75a86858
am: b8a19f4499

Change-Id: Iecdd4d4693534640aef408f40aa3fd1e1fa9b93e
2016-07-12 02:05:02 +00:00
TreeHugger Robot
3f947d1c58 Merge "Remove attempt to write sched_compat_yield" into nyc-mr1-dev 2016-07-12 00:09:03 +00:00
Tim Murray
b386d72266 Merge \"Add support for background stune group.\" into nyc-mr1-dev
am: 531bdd5a2c

Change-Id: Ia3be10db68dffc44e2d70535544c7c59d0933f7d
2016-07-11 23:55:17 +00:00
Tim Murray
531bdd5a2c Merge "Add support for background stune group." into nyc-mr1-dev 2016-07-11 23:21:12 +00:00
Irina Patru
ddb0f3c612 Merge \"init.rc: Remove cpu weight set on the root cgroup\" into nyc-mr1-dev
am: ac957cbd72

Change-Id: I00c942a5d3e283efe40541c12f7daac2d2c77770
2016-07-11 22:29:13 +00:00
Tim Kryger
f3e1f13d81 Remove attempt to write sched_compat_yield
The sched_compat_yield option was eliminated in Linux 2.6.38 by commit
ac53db596cc0 ("sched: Use a buddy to implement yield_task_fair()") and
as a result, the following error is printed to the log during boot up.

init: write_file: Unable to open '/proc/sys/kernel/sched_compat_yield':
No such file or directory"

Bug: 30034121
Change-Id: Idbdb68de0cb3ab1f67d82a4d66af880bcfdfe261
(cherry picked from commit 724dfbac70)
2016-07-11 15:22:50 -07:00
TreeHugger Robot
ac957cbd72 Merge "init.rc: Remove cpu weight set on the root cgroup" into nyc-mr1-dev 2016-07-11 22:20:22 +00:00
Tim Kryger
3886aaeae4 Merge \\\"Remove attempt to write sched_compat_yield\\\" am: 3f2db32b8c am: 49a986bf73
am: f789bd0133

Change-Id: I7434b27cf1662543efbe7b5d9fee6bac16cc9f26
2016-07-11 21:44:49 +00:00
Tim Kryger
49a986bf73 Merge \"Remove attempt to write sched_compat_yield\"
am: 3f2db32b8c

Change-Id: I13c56436dd00cf2d5336ba757ae2c32d2e2504b5
2016-07-11 21:31:08 +00:00
Tim Murray
5dcff8f2b1 Add support for background stune group.
bug 29512132

Change-Id: If8144bfee0fb30cf11f2bb26494ca5e83c11d4d7
2016-07-11 13:57:31 -07:00
Tim Murray
b8a19f4499 Merge changes from topic \'stune\' into nyc-mr1-dev
am: 4b75a86858

Change-Id: Ib11061d5d539f2e82ad16f122ea7d7b621bd988d
2016-07-11 20:35:56 +00:00
Irina Patru
23ad7517d2 init.rc: Remove cpu weight set on the root cgroup
It isn't allowed to change the cpu.share value for the root cgroup.
See kernel commit:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ec7dc8ac73e4a56ed03b673f026f08c0d547f597

This fixes the following error seen in dmesg:
init: write_file: Unable to write to '/dev/cpuctl/cpu.shares': Invalid argument

BUG: 28735908

Change-Id: I5ef359fb275792f99d13d35c62499026d354f6af
Signed-off-by: Irina Patru <irina.patru@intel.com>
(cherry picked from commit c560c6310f)
2016-07-11 12:35:51 -07:00
Tim Kryger
724dfbac70 Remove attempt to write sched_compat_yield
The sched_compat_yield option was eliminated in Linux 2.6.38 by commit
ac53db596cc0 ("sched: Use a buddy to implement yield_task_fair()") and
as a result, the following error is printed to the log during boot up.

init: write_file: Unable to open '/proc/sys/kernel/sched_compat_yield':
No such file or directory"

Bug: 30034121
Change-Id: Idbdb68de0cb3ab1f67d82a4d66af880bcfdfe261
2016-07-11 11:41:56 -07:00
Tim Murray
955694b657 Add support for top-app stune group.
bug 29512132

Change-Id: I41ec2dd80a469309f48dbb59fc27fbe43fcd67b3
2016-07-11 11:40:15 -07:00
Tim Murray
10b2ad167a resolve merge conflicts of 3a29e34 to nyc-mr1-dev-plus-aosp
am: 6469fa2a7e

Change-Id: I36b1580a9ce0548b27059699998289aa34fade7d
2016-07-07 20:47:56 +00:00