From 05e04a134e2a7f854f99186306c8033e02328fc0 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Mon, 1 Aug 2016 14:45:18 -0700 Subject: [PATCH] Remove redundant action triggers on persist.sys.usb.config persist.sys.usb.config stores the usb functions which need to be enabled when the phone boots up. When the phone is actually booted, setting this would also activate the following action trigger on sys.usb.config From init.usb.rc: Used to set USB configuration at boot and to switch the configuration when changing the default configuration on property:persist.sys.usb.config=* setprop sys.usb.config ${persist.sys.usb.config} sys.usb.config is anyways set to the actual functions by UsbDeviceManager once it is set to none. Therefore add "on boot" condition to the above action trigger so that persist.sys.usb.config does not race with sys.usb.config. BUG: 30440213 Change-Id: I3333d0b8334fb627469c7faad250bf3151bb1ebf --- rootdir/init.usb.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootdir/init.usb.rc b/rootdir/init.usb.rc index 1fd1e2a7a..915d159a5 100644 --- a/rootdir/init.usb.rc +++ b/rootdir/init.usb.rc @@ -103,7 +103,7 @@ on property:sys.usb.config=accessory,audio_source,adb && property:sys.usb.config # Used to set USB configuration at boot and to switch the configuration # when changing the default configuration -on property:persist.sys.usb.config=* +on boot && property:persist.sys.usb.config=* setprop sys.usb.config ${persist.sys.usb.config} #