diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-16 16:02:55 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-16 16:02:55 +0000 |
| commit | 44399871bcef4276799b772ff35197469e7e16b2 (patch) | |
| tree | 8839ef3311553c6c04be1a2a3b2d8ea6aaa7389e | |
| parent | 3261cd45a5d8f01194e5ec5f47a6e402dee1f118 (diff) | |
| parent | 2a92ac5f131c6e6e9e246d19572ae17b5c3c10b6 (diff) | |
| download | wahoo-pie-release.tar.gz | |
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-releaseandroid-9.0.0_r9android-9.0.0_r17pie-s2-releasepie-release
Change-Id: If529cdc7a3a24c8c3137a828310456523f8d09d8
| -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/" |