Google Git
Sign in
android/device/generic/goldfish/0f7ccc19^!/.
commit
0f7ccc19a4f4778782f4e198a61bff90e0829e77
[log]
author
Treehugger Robot <treehugger-gerrit@google.com>
Wed Jun 30 19:14:37 2021 +0000
committer
Ji Soo Shin <jisshin@google.com>
Wed Jun 30 21:43:41 2021 +0000
tree
e91c0451d38ab8fd45c4f96ab19626611b91a599
parent
afb8e3b8bbb457bd66f849a119056fd5351f2201 [diff]
Merge "Usb Passthrough: Enable usb passthrough on master" am: 4a17efcac3 am: 565951fd2f am: 1f476cc190 am: 00a11de1cc

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1751340

Change-Id: Ie73be004e92412af8535e602030616b626c6f3b3
Merged-In: Ie73be004e92412af8535e602030616b626c6f3b3
(cherry picked from commit c12148e10e8b5b47ca0e1be54b94c6a1dee66033)
Bug: 173649715

diff --git a/64bitonly/product/vendor.mk b/64bitonly/product/vendor.mk
index b3f5d02..7596a78 100644
--- a/64bitonly/product/vendor.mk
+++ b/64bitonly/product/vendor.mk

@@ -318,6 +318,7 @@
     frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
     frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
+    frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \
     frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
     frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \
     frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \

diff --git a/vendor.mk b/vendor.mk
index 0291856..9292b51 100644
--- a/vendor.mk
+++ b/vendor.mk

@@ -321,6 +321,7 @@
     frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
     frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
+    frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \
     frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
     frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \
     frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \