Merge "disable NFC when camera is in use for walleye" into oc-dr1-dev

am: 8208b41d9e

Change-Id: I26797965808b8c828467faa262ef65188d0d2cf3
This commit is contained in:
Zhijun He
2017-08-08 06:05:12 +00:00
committed by android-build-merger

View File

@@ -126,3 +126,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
ro.hwui.text_small_cache_height=1024 \
ro.hwui.text_large_cache_width=2048 \
ro.hwui.text_large_cache_height=1024
# NFC/camera interaction workaround - DO NOT COPY TO NEW DEVICES
PRODUCT_PROPERTY_OVERRIDES += \
ro.camera.notify_nfc=1