summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-11 15:25:35 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-11 15:25:35 +0000
commit7907953f85fa7201788f40422e9e85f5909e5283 (patch)
tree60c3aceae5d293bd6dbdca9b97835d19b46a9625
parentf45427616bb861122cc17ee3307f41f0862d06e5 (diff)
parent260e916049c305bc446d9c68c022c215a1b3e89c (diff)
downloadatv-t_frc_tz4_330443010.tar.gz
Snap for 8712302 from 260e916049c305bc446d9c68c022c215a1b3e89c to tm-frc-tzdata4-releaset_frc_tz4_330443010
Change-Id: If124664416c0b307e7a62c3c45c0f5148be13e23
-rw-r--r--overlay/TvLowRamOverlay/res/values/config.xml3
-rw-r--r--products/atv_product.mk5
2 files changed, 4 insertions, 4 deletions
diff --git a/overlay/TvLowRamOverlay/res/values/config.xml b/overlay/TvLowRamOverlay/res/values/config.xml
index c6b272a..2ca7899 100644
--- a/overlay/TvLowRamOverlay/res/values/config.xml
+++ b/overlay/TvLowRamOverlay/res/values/config.xml
@@ -15,9 +15,6 @@
-->
<resources>
- <!-- Make the IME killable by the lowmemorykiller by raising its oom_score_adj. -->
- <bool name="config_killableInputMethods">true</bool>
-
<!-- Prevent the InputMethodManagerService from starting up the IME unless
the currently focused view is a text editor. -->
<bool name="config_preventImeStartupUnlessTextEditor">true</bool>
diff --git a/products/atv_product.mk b/products/atv_product.mk
index 2da9862..40e80fa 100644
--- a/products/atv_product.mk
+++ b/products/atv_product.mk
@@ -27,7 +27,10 @@ PRODUCT_PACKAGES += \
TvWifiOverlay
PRODUCT_COPY_FILES += \
- device/google/atv/atv-component-overrides.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/atv-component-overrides.xml \
+ device/google/atv/atv-component-overrides.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/atv-component-overrides.xml
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.gamepad.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.gamepad.xml
# Too many tombstones can cause bugreports to grow too large to be uploaded.
PRODUCT_PRODUCT_PROPERTIES += \