Add vendor verbose logging control

User build does not have pixel logger. We need to control the logging
via verbose logging control directly. Pixel logger in userdebug could
disable the logging. It should not be overriden by vendor verbose
logging control.

Bug: 150582807
Change-Id: Ic39ec103b5fdb7527cd40107fb5c70aaaa475c90
diff --git a/init.hardware.diag.rc.user b/init.hardware.diag.rc.user
index f6ba93c..6b98ad4 100644
--- a/init.hardware.diag.rc.user
+++ b/init.hardware.diag.rc.user
@@ -36,7 +36,7 @@
     disabled
     oneshot
 
-on boot && property:persist.vendor.sys.modem.diag.mdlog=*
+on property:persist.vendor.sys.modem.diag.mdlog=*
     rm /data/vendor/radio/diag_logs/diag_mdlog_pid
     setprop vendor.sys.modem.diag.mdlog ${persist.vendor.sys.modem.diag.mdlog}
 
diff --git a/init.hardware.diag.rc.userdebug b/init.hardware.diag.rc.userdebug
index c624cbb..b3e4a80 100644
--- a/init.hardware.diag.rc.userdebug
+++ b/init.hardware.diag.rc.userdebug
@@ -45,7 +45,7 @@
     rm /data/vendor/radio/diag_logs/diag_mdlog_pid
     setprop vendor.sys.modem.diag.mdlog ${persist.vendor.sys.modem.diag.mdlog}
 
-on property:vendor.sys.modem.diag.mdlog=true
+on property:vendor.sys.modem.diag.mdlog=true && property:persist.vendor.verbose_logging_enabled=true
     start diag_mdlog_start
 
 on property:vendor.sys.modem.diag.mdlog=false
@@ -109,6 +109,3 @@
 
 on property:persist.vendor.usb.usbradio.config=*
    start usbd
-
-on property:persist.vendor.verbose_logging_enabled=*
-   setprop persist.vendor.sys.modem.diag.mdlog ${persist.vendor.verbose_logging_enabled}