Merge cherrypicks of [4793640, 4793602, 4793603, 4793660, 4793604, 4793680, 4793681, 4793581, 4793582, 4793625, 4793626, 4793627, 4793628, 4793700, 4793701, 4793702, 4793703, 4793704, 4793705, 4793661, 4793720, 4793721, 4793722, 4793723, 4793724, 4793725, 4793726, 4793727, 4793728, 4793583, 4793740, 4793760, 4793662, 4793780, 4793729] into pi-release-2
Change-Id: If7836c7e8b47b9f73723e34b4a261f4f342ef035
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/"
