From 80828af3def1f37eff1d483520df79ebe4238d55 Mon Sep 17 00:00:00 2001
From: Benoit Goby <benoit@android.com>
Date: Wed, 5 Dec 2012 18:04:01 -0800
Subject: [PATCH] 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
---
 rootdir/init.usb.rc | 1 +
 1 file changed, 1 insertion(+)

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}