Merge cherrypicks of [4793300, 4793320, 4793321, 4793340, 4793322, 4793061, 4793323, 4793324, 4793325, 4793380, 4793341, 4793342, 4793343, 4793265, 4793131, 4793132, 4793266, 4793133, 4793134, 4793400, 4793229, 4793381, 4793382, 4793383, 4793384, 4793385, 4793386, 4793387, 4793388, 4793062, 4793105, 4793063, 4793135, 4793389, 4793420] into pi-release
Change-Id: If529cdc7a3a24c8c3137a828310456523f8d09d8
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/"
