Merge "common: Merge init.qcom.factory.rc"

rootdir/etc/init.qcom.factory.rc

@@ -35,6 +35,9 @@ service fastmmi /system/bin/mmi
 on property:sys.boot_mode=ffbm
     write -p /dev/block /dev/block/bootdevice/by-name/misc "ffbm-01"
 
+on property:sys.boot_mode=qmmi
+    write -p /dev/block /dev/block/bootdevice/by-name/misc "ffbm-02"
+
 on property:sys.boot_mode=normal
     write -p /dev/block /dev/block/bootdevice/by-name/misc "normal"
 
@@ -46,23 +49,30 @@ on mmi
     # ========================================================
     #              This is FFBM only settings.
     # ========================================================
+
+    # A/B update verifier that marks a successful boot.
+    exec - root cache -- /system/bin/update_verifier nonencrypted
+
     #mkdir for factory data files.
-    mkdir /cache/FTM_AP 0750 root root
+    mkdir /persist/FTM_AP 0750 root root
+
+    #set property for sys.usb.config
+    setprop sys.usb.config diag,adb
 
     #Start the following services needed for fftm
+    start servicemanager
+    start surfaceflinger
+    start fastmmi
     start qcom-usb-sh
     start logd
     start debuggerd
     start debuggerd64
-    start servicemanager
-    start surfaceflinger
     start per_mgr
     start qcom-sh
     start ril-daemon
     start config_bluetooth
     start sensors
     start media
-    start fastmmi
     start wcnss-service
     start qcom-post-boot
     start rmt_storage
@@ -72,6 +82,7 @@ on mmi
     start qcomsysd
     start ptt_ffbm
     start tftp_server
+    start cnss-daemon
 
 on ffbm
     trigger early-fs