Merge cherrypicks of [2476230, 2476289, 2476272, 2476118, 2475997, 2476251, 2476119, 2476341, 2476252, 2476290, 2476232, 2476274, 2475999, 2476343, 2476275, 2476216, 2476381, 2476256, 2476000, 2476362, 2476345, 2476364, 2476234, 2476346, 2476347, 2476365, 2476276, 2476219, 2476277, 2476402, 2476348, 2476235, 2476383, 2476257, 2476278, 2476236, 2476350, 2476351, 2476307, 2476403, 2476308, 2476258] into oc-releaseandroid-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r32android-8.0.0_r31android-8.0.0_r3android-8.0.0_r29android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-r6-releaseoreo-r5-releaseoreo-r2-release

Change-Id: I778131d529af51890cead8360c9c2217153d662d

1 files changed, 2 insertions, 0 deletions

diff --git a/init.common.rc b/init.common.rc
index 57e46143..34767030 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -542,6 +542,8 @@ on property:init.svc.per_mgr=running
 
 on property:sys.shutdown.requested=*
     stop per_proxy
+    # Disable subsystem restart
+    write /sys/module/subsystem_restart/parameters/disable_restart_work 0x9889deed
 
 service qseecomd /vendor/bin/qseecomd
    class core