Merge a027d1f0fc on remote branch

Change-Id: I82124881dfc3fb1b39e204042872e6fca933097d
This commit is contained in:
Linux Build Service Account 2017-12-07 10:34:07 -08:00
commit 01f7db0576
2 changed files with 9 additions and 10 deletions

View file

@ -210,9 +210,11 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.sensor.relative_humidity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.relative_humidity.xml \ frameworks/native/data/etc/android.hardware.sensor.relative_humidity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.relative_humidity.xml \
frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.hifi_sensors.xml frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.hifi_sensors.xml
# High performance VR feature #Facing, CMC and Gesture
PRODUCT_COPY_FILES += \ PRODUCT_PROPERTY_OVERRIDES += \
frameworks/native/data/etc/android.hardware.vr.high_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vr.high_performance.xml ro.vendor.sensors.facing=false \
ro.vendor.sensors.cmc=false \
ro.vendor.sdk.sensors.gestures=false
# FBE support # FBE support
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \

View file

@ -146,6 +146,9 @@ ro.hwui.text_small_cache_height=1024
ro.hwui.text_large_cache_width=2048 ro.hwui.text_large_cache_width=2048
ro.hwui.text_large_cache_height=2048 ro.hwui.text_large_cache_height=2048
#Bringup properties
persist.radio.atfwd.start=true
#property to enable VDS WFD solution #property to enable VDS WFD solution
persist.hwc.enable_vds=1 persist.hwc.enable_vds=1
@ -161,12 +164,6 @@ ro.vendor.sensors.pmd=true
ro.vendor.sensors.sta_detect=true ro.vendor.sensors.sta_detect=true
#Motion Detector #Motion Detector
ro.vendor.sensors.mot_detect=true ro.vendor.sensors.mot_detect=true
#Facing
ro.vendor.sensors.facing=false
#CMC
ro.vendor.sensors.cmc=false
#Gesture
ro.vendor.sdk.sensors.gestures=false
#Expose aux camera for below packages #Expose aux camera for below packages
camera.aux.packagelist=org.codeaurora.snapcam camera.aux.packagelist=org.codeaurora.snapcam