Merge cherrypicks of ['googleplex-android-review.googlesource.com/25177133', 'googleplex-android-review.googlesource.com/25177134', 'googleplex-android-review.googlesource.com/25064388', 'googleplex-android-review.googlesource.com/25169438', 'googleplex-android-review.googlesource.com/25180080'] into udc-qpr1-release.
Change-Id: Id38f208e19713c347fdd76b0f5fe49855995b0b5
diff --git a/device-oriole.mk b/device-oriole.mk
index 7075e01..a260d2d 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -182,7 +182,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=71
+ ro.vendor.build.svn=73
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
@@ -280,3 +280,8 @@
# Enable DeviceAsWebcam support
PRODUCT_VENDOR_PROPERTIES += \
ro.usb.uvc.enabled=true
+
+# Quick Start device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.quick_start.oem_id=00e0 \
+ ro.quick_start.device_id=oriole
diff --git a/device-raven.mk b/device-raven.mk
index bb20cab..6a2f758 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -186,7 +186,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=71
+ ro.vendor.build.svn=73
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
@@ -291,3 +291,7 @@
# Enable DeviceAsWebcam support
PRODUCT_VENDOR_PROPERTIES += \
ro.usb.uvc.enabled=true
+# Quick Start device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.quick_start.oem_id=00e0 \
+ ro.quick_start.device_id=raven