summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-08-08 06:00:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-08 06:00:34 +0000
commit8208b41d9ed50c130ddb8824aa97caa684763c52 (patch)
tree557dc9e594bfe42a6e74f783c76f9d64a4f44f7d
parent2f18c79d913c310c77857da553e6503bba5d3e98 (diff)
parentc1a5b073590c0b3dfa19bc55f80822a536172270 (diff)
downloadmuskie-8208b41d9ed50c130ddb8824aa97caa684763c52.tar.gz
Merge "disable NFC when camera is in use for walleye" into oc-dr1-dev
-rw-r--r--device-common.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/device-common.mk b/device-common.mk
index fccfefe..b9150a9 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -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