Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.
Change-Id: I20acc9ce9c81f9685a046033ff6ccc95820ff83f
BUG: 117431430
diff --git a/device.mk b/device.mk
index 602d024..689b598 100755
--- a/device.mk
+++ b/device.mk
@@ -36,7 +36,7 @@
# Set the SVN for the targeted MR release
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=18
+ ro.vendor.build.svn=19
# Enforce privapp-permissions whitelist
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/usb/UsbGadget.cpp b/usb/UsbGadget.cpp
index 603afbb..66ac85e 100644
--- a/usb/UsbGadget.cpp
+++ b/usb/UsbGadget.cpp
@@ -30,7 +30,7 @@
constexpr int MAX_FILE_PATH_LENGTH = 256;
constexpr int EPOLL_EVENTS = 10;
constexpr bool DEBUG = false;
-constexpr int DISCONNECT_WAIT_US = 10000;
+constexpr int DISCONNECT_WAIT_US = 100000;
#define BUILD_TYPE "ro.build.type"
#define GADGET_PATH "/config/usb_gadget/g1/"
