diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-16 16:41:40 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-16 16:41:40 +0000 |
| commit | ac55d913813ee40cb6538c5c7943811ee88b4819 (patch) | |
| tree | 8839ef3311553c6c04be1a2a3b2d8ea6aaa7389e | |
| parent | 4632dabb4e1306d28240fe79d07b72f0d626d6d1 (diff) | |
| parent | 6c91ec9be143ca9893c10d7564c6b6475266210f (diff) | |
| download | device_google_wahoo-pie-release-2.tar.gz device_google_wahoo-pie-release-2.tar.bz2 device_google_wahoo-pie-release-2.zip | |
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-2android-9.0.0_r18android-9.0.0_r10pie-release-2pie-r2-s2-release
Change-Id: If7836c7e8b47b9f73723e34b4a261f4f342ef035
| -rwxr-xr-x | device.mk | 2 | ||||
| -rw-r--r-- | usb/UsbGadget.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -36,7 +36,7 @@ PRODUCT_COPY_FILES += \ # 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 603afbba..66ac85e5 100644 --- a/usb/UsbGadget.cpp +++ b/usb/UsbGadget.cpp @@ -30,7 +30,7 @@ constexpr int BUFFER_SIZE = 512; 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/" |