Merge cherrypicks of [7444491, 7444492] into pi-qpr3-release (09b63da6) · Commits · e / os / android_system_core

rootdir/init.rc

+4 −10

Original line number	Diff line number	Diff line
		@@ -381,6 +381,10 @@ on late-fs
		# HALs required before storage encryption can get unlocked (FBE/FDE)
		class_start early_hal

		# Check and mark a successful boot, before mounting userdata with mount_all.
		# No-op for non-A/B device.
		exec_start update_verifier_nonencrypted

		on post-fs-data
		# We chown/chmod /data again so because mount is run as root + defaults
		chown system system /data
		@@ -558,22 +562,16 @@ on post-fs-data
		# It is recommended to put unnecessary data/ initialization from post-fs-data
		# to start-zygote in device's init.rc to unblock zygote start.
		on zygote-start && property:ro.crypto.state=unencrypted
		# A/B update verifier that marks a successful boot.
		exec_start update_verifier_nonencrypted
		start netd
		start zygote
		start zygote_secondary

		on zygote-start && property:ro.crypto.state=unsupported
		# A/B update verifier that marks a successful boot.
		exec_start update_verifier_nonencrypted
		start netd
		start zygote
		start zygote_secondary

		on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file
		# A/B update verifier that marks a successful boot.
		exec_start update_verifier_nonencrypted
		start netd
		start zygote
		start zygote_secondary
		@@ -700,15 +698,11 @@ on property:vold.decrypt=trigger_post_fs_data
		trigger zygote-start

		on property:vold.decrypt=trigger_restart_min_framework
		# A/B update verifier that marks a successful boot.
		exec_start update_verifier
		class_start main

		on property:vold.decrypt=trigger_restart_framework
		stop surfaceflinger
		start surfaceflinger
		# A/B update verifier that marks a successful boot.
		exec_start update_verifier
		class_start main
		class_start late_start