Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: Iff6d58e82d768f7c6b6591b98807ca5fbdab8215
This commit is contained in:
Bill Yi
2018-10-24 09:05:06 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -36,7 +36,7 @@ PRODUCT_COPY_FILES += \
# Set the SVN for the targeted MR release
PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.build.svn=17
ro.vendor.build.svn=19
# Enforce privapp-permissions whitelist
PRODUCT_PROPERTY_OVERRIDES += \

View File

@@ -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/"