commit 21360a9e8bdf128db011441a1d3b091d8fadd2e5
author Jorge E. Moreira <jemoreira@google.com> Mon Apr 01 23:22:10 2019 -0700
committer Alistair Strachan <astrachan@google.com> Tue Apr 02 09:57:00 2019 +0000
tree ec84a2a760686705a8ba12890454e8e2329d07fb
parent 22bb34bf064021ea5dd8f18cdcad64169dd0c4db

Disable Setup Wizard at build time instead of boot

Bug: 129689270
Test: run locally
Change-Id: Id8768e23c14977b000600da23bbad896538d6b8d

shared/config/init.common.rc

diff --git a/shared/config/init.common.rc b/shared/config/init.common.rc
index 9da1c53..e550a11 100644
--- a/shared/config/init.common.rc
+++ b/shared/config/init.common.rc
@@ -12,10 +12,6 @@
     setprop ro.sf.lcd_density ${ro.boot.lcd_density}
 
 
-on early-init && property:ro.boot.setupwizard_mode=*
-    setprop ro.setupwizard.mode ${ro.boot.setupwizard_mode}
-
-
 on init
     # ZRAM setup
     write /sys/block/zram0/comp_algorithm lz4

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index 1a1c9db..11c63b2 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -29,6 +29,7 @@
     persist.traced.enable=1 \
     persist.heapprofd.enable=1 \
     ro.com.google.locationfeatures=1 \
+    ro.setupwizard.mode=DISABLED \
  
 # Explanation of specific properties:
 #   debug.hwui.swap_with_damage avoids boot failure on M http://b/25152138