diff options
| author | Guillaume Bailey <gubailey@google.com> | 2022-04-26 22:48:10 +0000 |
|---|---|---|
| committer | Guillaume Bailey <gubailey@google.com> | 2022-04-29 04:12:47 +0000 |
| commit | bb28fc38e55a4c2d8fd257abbccf4ffcdfc7f7e8 (patch) | |
| tree | 9f045f6c7dd3895c3e27ac785ee03883f825a0e8 | |
| parent | 873e5032fe21b31c9393684ba5508b7d492b312f (diff) | |
| download | atv-bb28fc38e55a4c2d8fd257abbccf4ffcdfc7f7e8.tar.gz | |
Revert "Disable camera features/server on TV SDK"
Revert submission 10056668-tv_adjust_camera_cts-master
Test: CtsCameraTestCases mostly pass; b/228250223#comment46; ran
//third_party/tachyon/javatests/com/google/android/apps/tachyon/espresso:group_call_espresso_tests_tv_dev_29
(still fails, but not for lack of camera)
Reason for revert: Support testing video call on TV emulator
Reverted Changes:
I172f4c5ab:Disable camera features/server on TV SDK
I525ce6248:Disable camera on TVs
Change-Id: I0d093964f42fe844b57e8b001028fcfb9a37ebfe
| -rw-r--r-- | permissions/tv_sdk_excluded_core_hardware.xml | 6 | ||||
| -rw-r--r-- | products/sdk_atv_armv7.mk | 3 | ||||
| -rw-r--r-- | products/sdk_atv_x86.mk | 3 |
3 files changed, 1 insertions, 11 deletions
diff --git a/permissions/tv_sdk_excluded_core_hardware.xml b/permissions/tv_sdk_excluded_core_hardware.xml index 97a006a..76e365f 100644 --- a/permissions/tv_sdk_excluded_core_hardware.xml +++ b/permissions/tv_sdk_excluded_core_hardware.xml @@ -16,12 +16,8 @@ <!-- Excludes all non-default ATV SDK features to comply with CTS --> <permissions> - <!-- ATV SDK is not designed to have any cameras by default --> - <unavailable-feature name="android.hardware.camera" /> - <unavailable-feature name="android.hardware.camera.front" /> - <unavailable-feature name="android.hardware.camera.any" /> + <!-- ATV SDK needs some basic camera features to enable video calling, but can exclude some --> <unavailable-feature name="android.hardware.camera.ar" /> - <unavailable-feature name="android.hardware.camera.autofocus" /> <unavailable-feature name="android.hardware.camera.level.full" /> <unavailable-feature name="android.hardware.camera.capability.manual_sensor" /> <unavailable-feature name="android.hardware.camera.capability.manual_post_processing" /> diff --git a/products/sdk_atv_armv7.mk b/products/sdk_atv_armv7.mk index ab578fc..e161a3b 100644 --- a/products/sdk_atv_armv7.mk +++ b/products/sdk_atv_armv7.mk @@ -16,9 +16,6 @@ PRODUCT_IS_ATV_SDK := true -# ATV SDK is not designed to have a camera by default -PRODUCT_SUPPORTS_CAMERA ?= false - QEMU_USE_SYSTEM_EXT_PARTITIONS := true $(call inherit-product, device/google/atv/products/aosp_tv_arm.mk) diff --git a/products/sdk_atv_x86.mk b/products/sdk_atv_x86.mk index 3e0af4c..57555ca 100644 --- a/products/sdk_atv_x86.mk +++ b/products/sdk_atv_x86.mk @@ -15,9 +15,6 @@ # PRODUCT_IS_ATV_SDK := true -# ATV SDK is not designed to have a camera by default -PRODUCT_SUPPORTS_CAMERA ?= false - QEMU_USE_SYSTEM_EXT_PARTITIONS := true $(call inherit-product, device/google/atv/products/aosp_tv_x86.mk) |