From ad13acc5a66d4edefdae49f52e655075465d0d94 Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Fri, 19 May 2023 00:15:52 +0000 Subject: [PATCH] DeviceAsWebcam: Add overlays for physical camera id Using physical streams reduces power since camera consumes a bulk of the power. Bug: 242346116 Test: Manual webcam use; See power reduction Change-Id: Iceb40743dc53dbb50640969294c9f18f4dda60c0 Signed-off-by: Jayant Chowdhary --- .../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 insertions(+) create mode 100644 cheetah/overlay_packages/DeviceAsWebcamCheetah/Android.bp create mode 100644 cheetah/overlay_packages/DeviceAsWebcamCheetah/AndroidManifest.xml create mode 100644 cheetah/overlay_packages/DeviceAsWebcamCheetah/OWNERS create mode 100644 cheetah/overlay_packages/DeviceAsWebcamCheetah/res/raw/physical_camera_mapping.json create mode 100644 panther/overlay_packages/DeviceAsWebcamPanther/Android.bp create mode 100644 panther/overlay_packages/DeviceAsWebcamPanther/AndroidManifest.xml create mode 100644 panther/overlay_packages/DeviceAsWebcamPanther/OWNERS create 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 new file mode 100644 index 0000000..148e1af --- /dev/null +++ b/cheetah/overlay_packages/DeviceAsWebcamCheetah/Android.bp @@ -0,0 +1,10 @@ +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 new file mode 100644 index 0000000..cc7d3ba --- /dev/null +++ b/cheetah/overlay_packages/DeviceAsWebcamCheetah/AndroidManifest.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/cheetah/overlay_packages/DeviceAsWebcamCheetah/OWNERS b/cheetah/overlay_packages/DeviceAsWebcamCheetah/OWNERS new file mode 100644 index 0000000..d22af85 --- /dev/null +++ b/cheetah/overlay_packages/DeviceAsWebcamCheetah/OWNERS @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..4dd9988 --- /dev/null +++ b/cheetah/overlay_packages/DeviceAsWebcamCheetah/res/raw/physical_camera_mapping.json @@ -0,0 +1 @@ +{"0": {"3" : "UW"}} \ No newline at end of file diff --git a/device-cheetah.mk b/device-cheetah.mk index 6866761..af512a1 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -321,6 +321,10 @@ 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 abebd24..e6ecd57 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -307,6 +307,10 @@ 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 new file mode 100644 index 0000000..a54f398 --- /dev/null +++ b/panther/overlay_packages/DeviceAsWebcamPanther/Android.bp @@ -0,0 +1,10 @@ +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 new file mode 100644 index 0000000..cc7d3ba --- /dev/null +++ b/panther/overlay_packages/DeviceAsWebcamPanther/AndroidManifest.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/panther/overlay_packages/DeviceAsWebcamPanther/OWNERS b/panther/overlay_packages/DeviceAsWebcamPanther/OWNERS new file mode 100644 index 0000000..d22af85 --- /dev/null +++ b/panther/overlay_packages/DeviceAsWebcamPanther/OWNERS @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..4dd9988 --- /dev/null +++ b/panther/overlay_packages/DeviceAsWebcamPanther/res/raw/physical_camera_mapping.json @@ -0,0 +1 @@ +{"0": {"3" : "UW"}} \ No newline at end of file