Move toggling of setupwizard from vendor to product init
Bug: 129911807
Test: run locally
Change-Id: I18d0616c6534f4d4cedf226f5033222b96909ba5
diff --git a/shared/config/init.common.rc b/shared/config/init.common.rc
index 2510857..6a1aaec 100644
--- a/shared/config/init.common.rc
+++ b/shared/config/init.common.rc
@@ -10,7 +10,6 @@
mount debugfs debugfs /sys/kernel/debug
chmod 0755 /sys/kernel/debug
setprop ro.sf.lcd_density ${ro.boot.lcd_density}
- setprop ro.setupwizard.mode ${ro.boot.setupwizard_mode}
setprop ro.hardware.gralloc ${ro.boot.hardware.gralloc}
setprop ro.hardware.hwcomposer ${ro.boot.hardware.hwcomposer}
diff --git a/shared/config/init.product.rc b/shared/config/init.product.rc
new file mode 100644
index 0000000..a3d10e5
--- /dev/null
+++ b/shared/config/init.product.rc
@@ -0,0 +1,2 @@
+on early-init
+ setprop ro.setupwizard.mode ${ro.boot.setupwizard_mode}
\ No newline at end of file
diff --git a/shared/device.mk b/shared/device.mk
index 0f48834..869010b 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -113,6 +113,7 @@
device/google/cuttlefish/shared/config/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.common.rc \
device/google/cuttlefish/shared/config/init.cutf_ivsh.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.cutf_ivsh.rc \
device/google/cuttlefish/shared/config/init.cutf_cvm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.cutf_cvm.rc \
+ device/google/cuttlefish/shared/config/init.product.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/init.rc \
device/google/cuttlefish/shared/config/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
device/google/cuttlefish/shared/config/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
device/google/cuttlefish/shared/config/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
diff --git a/shared/sepolicy/property_contexts b/shared/sepolicy/property_contexts
index d49db3e..2614c0a 100644
--- a/shared/sepolicy/property_contexts
+++ b/shared/sepolicy/property_contexts
@@ -7,8 +7,6 @@
ro.cdma.home.operator.alpha u:object_r:vendor_init_radio_prop:s0
ro.cdma.home.operator.numeric u:object_r:vendor_init_radio_prop:s0
vendor.vsock_logcat_status u:object_r:vsock_logcat_status_prop:s0
-ro.boot.setupwizard_mode u:object_r:cf_setupwizard_mode_prop:s0
-ro.setupwizard.mode u:object_r:vendor_init_setupwizard_prop:s0
ro.boot.hardware.gralloc u:object_r:cf_graphics_config_prop:s0 exact string
ro.boot.hardware.hwcomposer u:object_r:cf_graphics_config_prop:s0 exact string
ro.boot.lcd_density u:object_r:cf_graphics_config_prop:s0 exact int
diff --git a/shared/sepolicy/vendor_init.te b/shared/sepolicy/vendor_init.te
index bb0d8c5..6ff4a1e 100644
--- a/shared/sepolicy/vendor_init.te
+++ b/shared/sepolicy/vendor_init.te
@@ -16,7 +16,4 @@
get_prop(vendor_init, vendor_ser_prop)
-get_prop(vendor_init, cf_setupwizard_mode_prop)
-
-set_prop(vendor_init, vendor_init_setupwizard_prop)
get_prop(vendor_init, cf_graphics_config_prop)
