From 89f99fd401149088f72b27ab9fee5dfda5476602 Mon Sep 17 00:00:00 2001
From: Avichal Rakesh <arakesh@google.com>
Date: Wed, 12 Jul 2023 15:37:01 -0700
Subject: [PATCH 1/2] 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: I2157c2ee23301987d80e4cda9da7bdaea3725025
---
 bluejay/overlay_packages/DeviceAsWebcam/Android.bp    | 10 ++++++++++
 .../DeviceAsWebcam/AndroidManifest.xml                | 11 +++++++++++
 bluejay/overlay_packages/DeviceAsWebcam/OWNERS        |  1 +
 .../res/raw/physical_camera_mapping.json              |  1 +
 device-bluejay.mk                                     |  5 +++++
 5 files changed, 28 insertions(+)
 create mode 100644 bluejay/overlay_packages/DeviceAsWebcam/Android.bp
 create mode 100644 bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml
 create mode 100644 bluejay/overlay_packages/DeviceAsWebcam/OWNERS
 create mode 100644 bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json

diff --git a/bluejay/overlay_packages/DeviceAsWebcam/Android.bp b/bluejay/overlay_packages/DeviceAsWebcam/Android.bp
new file mode 100644
index 0000000..b102861
--- /dev/null
+++ b/bluejay/overlay_packages/DeviceAsWebcam/Android.bp
@@ -0,0 +1,10 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "DeviceAsWebcamBluejay",
+    certificate: "platform",
+    product_specific: true,
+    sdk_version: "current",
+}
diff --git a/bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml b/bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml
new file mode 100644
index 0000000..5908180
--- /dev/null
+++ b/bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.google.android.overlay.DeviceAsWebcam"
+          android:versionCode="1"
+          android:versionName="1.0" >
+    <application android:hasCode="false" />
+    <overlay
+        android:targetPackage="com.android.DeviceAsWebcam"
+        android:isStatic="true"
+        android:priority="1"/>
+</manifest>
diff --git a/bluejay/overlay_packages/DeviceAsWebcam/OWNERS b/bluejay/overlay_packages/DeviceAsWebcam/OWNERS
new file mode 100644
index 0000000..f48a95c
--- /dev/null
+++ b/bluejay/overlay_packages/DeviceAsWebcam/OWNERS
@@ -0,0 +1 @@
+include platform/frameworks/av:/camera/OWNERS
diff --git a/bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json b/bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json
new file mode 100644
index 0000000..d847e25
--- /dev/null
+++ b/bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json
@@ -0,0 +1 @@
+{"0": {"3" : "UW"}}
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 0322079..92d332a 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -194,6 +194,11 @@ PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
 
+
+# Android DeviceAsWebcam specific overlay
+PRODUCT_PACKAGES += \
+    DeviceAsWebcamBluejay
+
 # SKU specific RROs
 PRODUCT_PACKAGES += \
     SettingsOverlayGB17L \

From ffeb34f7752d891556b0b200d5918d148b980ceb Mon Sep 17 00:00:00 2001
From: Avichal Rakesh <arakesh@google.com>
Date: Tue, 16 May 2023 13:31:19 -0700
Subject: [PATCH 2/2] Enable UVC support on Bluejay

Bluejay now supports UVC gadget function. Setting this flag triggers the
framework to surface the UVC specific functionality and UI.

Test: Manually tested that the UVC functionality is enabled
Bug: 242344221
Change-Id: Ibd1f8e2669a26c6c1e97ba9a4554fe0d41d5421d
---
 device-bluejay.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device-bluejay.mk b/device-bluejay.mk
index 92d332a..2d15b5b 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -251,3 +251,7 @@ PRODUCT_PRODUCT_PROPERTIES ?= \
 
 # UFS: the script is used to select the corresponding firmware to run FFU.
 PRODUCT_PACKAGES += ufs_firmware_update.sh
+
+# Enable DeviceAsWebcam support
+PRODUCT_VENDOR_PROPERTIES += \
+    ro.usb.uvc.enabled=true