diff options
| author | Zhijun He <zhijunhe@google.com> | 2017-08-08 06:05:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-08 06:05:12 +0000 |
| commit | 694505bb7a836e85e6a83c98e7c8c7fc5e29a566 (patch) | |
| tree | 0bd57241eaf102028baec73f0a1f40c5d8b03ba5 | |
| parent | 4aea399deaef1530b84a5c33574d224c40212bd6 (diff) | |
| parent | 8208b41d9ed50c130ddb8824aa97caa684763c52 (diff) | |
Merge "disable NFC when camera is in use for walleye" into oc-dr1-dev
am: 8208b41d9e
Change-Id: Ib9441dcf43f3d4ac6d4e81dea77f90033ca4f1ab
| -rw-r--r-- | device-common.mk | 4 |
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 |