From 751dfddc198b64409d035b8a80b526c0815432fb Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Wed, 9 Sep 2015 12:10:58 -0700 Subject: Don't show UI on default encryption Bug: 22989588 Change-Id: I8e7023767f1da80c872adc45871be1f8851926ad --- rootdir/init.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rootdir') diff --git a/rootdir/init.rc b/rootdir/init.rc index 2b1a97c..ab3ca5a 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -651,7 +651,7 @@ service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted # encryption) or trigger_restart_min_framework (other encryption) # One shot invocation to encrypt unencrypted volumes -service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default +service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default noui disabled oneshot # vold will set vold.decrypt to trigger_restart_framework (default -- cgit v1.1 From f429d37807a005c1de38a7616669bf1834d45432 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Thu, 15 Oct 2015 12:38:15 -0700 Subject: Reorder init.rc to avoid a kernel warning. 3.18 has a warning in dmesg that appears when the parent cpuset's cpus and mems are changed to something other than what the child has. Reorder init.rc to prevent this warning from appearing. bug 24941443 Change-Id: I49d8394063b23dce03222dcc9ddccdc32bb97ea2 --- rootdir/init.rc | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'rootdir') diff --git a/rootdir/init.rc b/rootdir/init.rc index 8ea72e8..e814d0c 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -140,23 +140,27 @@ on init # sets up initial cpusets for ActivityManager mkdir /dev/cpuset mount cpuset none /dev/cpuset + + # this ensures that the cpusets are present and usable, but the device's + # init.rc must actually set the correct cpus mkdir /dev/cpuset/foreground + write /dev/cpuset/foreground/cpus 0 + write /dev/cpuset/foreground/mems 0 mkdir /dev/cpuset/foreground/boost + write /dev/cpuset/foreground/boost/cpus 0 + write /dev/cpuset/foreground/boost/mems 0 mkdir /dev/cpuset/background + write /dev/cpuset/background/cpus 0 + write /dev/cpuset/background/mems 0 + # system-background is for system tasks that should only run on # little cores, not on bigs - # to be used only by init, so don't change the permissions + # to be used only by init, so don't change system-bg permissions mkdir /dev/cpuset/system-background - # this ensures that the cpusets are present and usable, but the device's - # init.rc must actually set the correct cpus - write /dev/cpuset/foreground/cpus 0 - write /dev/cpuset/foreground/boost/cpus 0 - write /dev/cpuset/background/cpus 0 write /dev/cpuset/system-background/cpus 0 - write /dev/cpuset/foreground/mems 0 - write /dev/cpuset/foreground/boost/mems 0 - write /dev/cpuset/background/mems 0 write /dev/cpuset/system-background/mems 0 + + # change permissions for all cpusets we'll touch at runtime chown system system /dev/cpuset chown system system /dev/cpuset/foreground chown system system /dev/cpuset/foreground/boost -- cgit v1.1