Merge "Revert "Temporarily disable QCOM RenderScript driver until we get a working"" into oc-dev am: 5f2fbe20dc
am: de270676af
Change-Id: I2247c6c0bf185aa441b1609229fe84bacf3bc1fd
diff --git a/device-common.mk b/device-common.mk
index 216dc73..dd32e5e 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -31,6 +31,9 @@
DEVICE_PACKAGE_OVERLAYS += device/google/marlin/overlay
+PRODUCT_ENFORCE_RRO_TARGETS := \
+ framework-res
+
# Input device files
PRODUCT_COPY_FILES += \
device/google/marlin/gpio-keys.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gpio-keys.kl \
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
index 822d718..430d16e 100644
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ b/overlay/packages/services/Telephony/res/values/config.xml
@@ -27,4 +27,6 @@
<bool name="config_allow_hfa_outside_of_setup_wizard">false</bool>
<!-- Show Hearing aids option in Call Settings -->
<bool name="hac_enabled">true</bool>
+ <!-- Allow handover from telephony calls to another ConnectionService. -->
+ <bool name="config_support_handover_from">true</bool>
</resources>
