From ad76abb6729e7a0e34082358d92ae9d251e5e519 Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Fri, 1 Sep 2023 03:09:24 +0000 Subject: [PATCH] Revert "DeviceAsWebcam: Add overlays for physical camera id" This reverts commit ad13acc5a66d4edefdae49f52e655075465d0d94. Reason for revert: With stream use case VIDEO_CALL power consumption for webcam is within permissible limits (3W) Bug: 300166920 Change-Id: I754eaec7fa3386481198404c9be1065323b328e6 --- .../overlay_packages/DeviceAsWebcamCheetah/Android.bp | 10 ---------- .../DeviceAsWebcamCheetah/AndroidManifest.xml | 10 ---------- cheetah/overlay_packages/DeviceAsWebcamCheetah/OWNERS | 1 - .../res/raw/physical_camera_mapping.json | 1 - device-cheetah.mk | 4 ---- device-panther.mk | 4 ---- .../overlay_packages/DeviceAsWebcamPanther/Android.bp | 10 ---------- .../DeviceAsWebcamPanther/AndroidManifest.xml | 10 ---------- panther/overlay_packages/DeviceAsWebcamPanther/OWNERS | 1 - .../res/raw/physical_camera_mapping.json | 1 - 10 files changed, 52 deletions(-) delete mode 100644 cheetah/overlay_packages/DeviceAsWebcamCheetah/Android.bp delete mode 100644 cheetah/overlay_packages/DeviceAsWebcamCheetah/AndroidManifest.xml delete mode 100644 cheetah/overlay_packages/DeviceAsWebcamCheetah/OWNERS delete mode 100644 cheetah/overlay_packages/DeviceAsWebcamCheetah/res/raw/physical_camera_mapping.json delete mode 100644 panther/overlay_packages/DeviceAsWebcamPanther/Android.bp delete mode 100644 panther/overlay_packages/DeviceAsWebcamPanther/AndroidManifest.xml delete mode 100644 panther/overlay_packages/DeviceAsWebcamPanther/OWNERS delete mode 100644 panther/overlay_packages/DeviceAsWebcamPanther/res/raw/physical_camera_mapping.json diff --git a/cheetah/overlay_packages/DeviceAsWebcamCheetah/Android.bp b/cheetah/overlay_packages/DeviceAsWebcamCheetah/Android.bp deleted file mode 100644 index 148e1af..0000000 --- a/cheetah/overlay_packages/DeviceAsWebcamCheetah/Android.bp +++ /dev/null @@ -1,10 +0,0 @@ -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -runtime_resource_overlay { - name: "DeviceAsWebcamCheetah", - certificate: "platform", - product_specific: true, - sdk_version: "current", -} diff --git a/cheetah/overlay_packages/DeviceAsWebcamCheetah/AndroidManifest.xml b/cheetah/overlay_packages/DeviceAsWebcamCheetah/AndroidManifest.xml deleted file mode 100644 index cc7d3ba..0000000 --- a/cheetah/overlay_packages/DeviceAsWebcamCheetah/AndroidManifest.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/cheetah/overlay_packages/DeviceAsWebcamCheetah/OWNERS b/cheetah/overlay_packages/DeviceAsWebcamCheetah/OWNERS deleted file mode 100644 index d22af85..0000000 --- a/cheetah/overlay_packages/DeviceAsWebcamCheetah/OWNERS +++ /dev/null @@ -1 +0,0 @@ -include platform/frameworks/av:/camera/OWNERS \ No newline at end of file diff --git a/cheetah/overlay_packages/DeviceAsWebcamCheetah/res/raw/physical_camera_mapping.json b/cheetah/overlay_packages/DeviceAsWebcamCheetah/res/raw/physical_camera_mapping.json deleted file mode 100644 index 4dd9988..0000000 --- a/cheetah/overlay_packages/DeviceAsWebcamCheetah/res/raw/physical_camera_mapping.json +++ /dev/null @@ -1 +0,0 @@ -{"0": {"3" : "UW"}} \ No newline at end of file diff --git a/device-cheetah.mk b/device-cheetah.mk index ab0cf94..62556a9 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -318,10 +318,6 @@ PRODUCT_PACKAGES += \ NoCutoutOverlay \ AvoidAppsInCutoutOverlay -# Android DeviceAsWebcam specific overlay -PRODUCT_PACKAGES += \ - DeviceAsWebcamCheetah - # SKU specific RROs PRODUCT_PACKAGES += \ SettingsOverlayGFE4J \ diff --git a/device-panther.mk b/device-panther.mk index 2149fff..1416685 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -304,10 +304,6 @@ PRODUCT_PACKAGES += \ NoCutoutOverlay \ AvoidAppsInCutoutOverlay -# Android DeviceAsWebcam specific overlay -PRODUCT_PACKAGES += \ - DeviceAsWebcamPanther - # SKU specific RROs PRODUCT_PACKAGES += \ SettingsOverlayG03Z5 \ diff --git a/panther/overlay_packages/DeviceAsWebcamPanther/Android.bp b/panther/overlay_packages/DeviceAsWebcamPanther/Android.bp deleted file mode 100644 index a54f398..0000000 --- a/panther/overlay_packages/DeviceAsWebcamPanther/Android.bp +++ /dev/null @@ -1,10 +0,0 @@ -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -runtime_resource_overlay { - name: "DeviceAsWebcamPanther", - certificate: "platform", - product_specific: true, - sdk_version: "current", -} diff --git a/panther/overlay_packages/DeviceAsWebcamPanther/AndroidManifest.xml b/panther/overlay_packages/DeviceAsWebcamPanther/AndroidManifest.xml deleted file mode 100644 index cc7d3ba..0000000 --- a/panther/overlay_packages/DeviceAsWebcamPanther/AndroidManifest.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/panther/overlay_packages/DeviceAsWebcamPanther/OWNERS b/panther/overlay_packages/DeviceAsWebcamPanther/OWNERS deleted file mode 100644 index d22af85..0000000 --- a/panther/overlay_packages/DeviceAsWebcamPanther/OWNERS +++ /dev/null @@ -1 +0,0 @@ -include platform/frameworks/av:/camera/OWNERS \ No newline at end of file diff --git a/panther/overlay_packages/DeviceAsWebcamPanther/res/raw/physical_camera_mapping.json b/panther/overlay_packages/DeviceAsWebcamPanther/res/raw/physical_camera_mapping.json deleted file mode 100644 index 4dd9988..0000000 --- a/panther/overlay_packages/DeviceAsWebcamPanther/res/raw/physical_camera_mapping.json +++ /dev/null @@ -1 +0,0 @@ -{"0": {"3" : "UW"}} \ No newline at end of file