summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2012-12-05 18:04:01 -0800
committerBenoit Goby <benoit@android.com>2012-12-05 18:04:01 -0800
commit80828af3def1f37eff1d483520df79ebe4238d55 (patch)
tree63281fdc8d0699fa7cbaecd56e9f3ce071e8322c
parentb20fa762b515b5e96c158959d8c8d0c2ff1bf46b (diff)
downloadcore-80828af3def1f37eff1d483520df79ebe4238d55.tar.gz
init.usb.rc: set sys.usb.config to none before changing it
On encrypted devices, persistent properties are loaded after the device is decrypted. To properly change sys.usb.config to its persistent value, it must first be set to "none" and then to ${persist.sys.usb.config}. Bug: 7678835 Change-Id: I4f91245cedc04e3178ce9cee21390f5b657733c9
-rw-r--r--rootdir/init.usb.rc1
1 files changed, 1 insertions, 0 deletions
diff --git a/rootdir/init.usb.rc b/rootdir/init.usb.rc
index 15467cc21..f37b630bc 100644
--- a/rootdir/init.usb.rc
+++ b/rootdir/init.usb.rc
@@ -88,4 +88,5 @@ on property:sys.usb.config=accessory,audio_source,adb
# 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 none
setprop sys.usb.config ${persist.sys.usb.config}