aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-02-16 23:39:18 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-02-16 23:39:18 +0000
commit14f6a4f50d9a713c15175ac8fa5da14c06c57d61 (patch)
tree0c8d2b916aedf2efb3339dbd435cb970360b7bef
parentdead01d78e0251b21f5e1a02e13c6002ab493065 (diff)
parent520441aa34901a4adc177f5bee3339078918be33 (diff)
downloadcuttlefish-14f6a4f50d9a713c15175ac8fa5da14c06c57d61.tar.gz
Merge "Advertise multitouch support to Android apps" into main
-rw-r--r--shared/auto/device_vendor.mk2
-rw-r--r--shared/phone/device_vendor.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/shared/auto/device_vendor.mk b/shared/auto/device_vendor.mk
index 0158dc697..c48559aa6 100644
--- a/shared/auto/device_vendor.mk
+++ b/shared/auto/device_vendor.mk
@@ -52,7 +52,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/car_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/car_core_hardware.xml \
frameworks/native/data/etc/android.hardware.broadcastradio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.broadcastradio.xml \
- frameworks/native/data/etc/android.hardware.faketouch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.faketouch.xml \
+ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml \
frameworks/native/data/etc/android.hardware.screen.landscape.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.screen.landscape.xml \
frameworks/native/data/etc/android.software.activities_on_secondary_displays.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.activities_on_secondary_displays.xml \
diff --git a/shared/phone/device_vendor.mk b/shared/phone/device_vendor.mk
index e22a22ff8..a9be2ced5 100644
--- a/shared/phone/device_vendor.mk
+++ b/shared/phone/device_vendor.mk
@@ -47,7 +47,7 @@ TARGET_PRODUCT_PROP := $(LOCAL_PATH)/product.prop
TARGET_VENDOR_PROP := $(LOCAL_PATH)/vendor.prop
PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.faketouch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.faketouch.xml \
+ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml \
frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
ifneq ($(TARGET_DISABLE_BIOMETRICS_FACE),true)