From c1f4f50bd0c8524a91dfaf563361826520e91c6d Mon Sep 17 00:00:00 2001
From: Jayant Chowdhary <jchowdhary@google.com>
Date: Tue, 12 Sep 2023 23:34:32 +0000
Subject: [PATCH] Revert "DeviceAsWebcam: Add overlays for physical camera id"

This reverts commit 89f99fd401149088f72b27ab9fee5dfda5476602.

Reason for revert: With stream use case VIDEO_CALL + logical stream power is well within the permissible limit of 3W.

Bug: 300166920

Change-Id: I2d764fdf2dc3124d3f60513c5e76108b52ed8f7b
---
 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 deletions(-)
 delete mode 100644 bluejay/overlay_packages/DeviceAsWebcam/Android.bp
 delete mode 100644 bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml
 delete mode 100644 bluejay/overlay_packages/DeviceAsWebcam/OWNERS
 delete 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
deleted file mode 100644
index b102861..0000000
--- a/bluejay/overlay_packages/DeviceAsWebcam/Android.bp
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 5908180..0000000
--- a/bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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
deleted file mode 100644
index f48a95c..0000000
--- a/bluejay/overlay_packages/DeviceAsWebcam/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index d847e25..0000000
--- a/bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json
+++ /dev/null
@@ -1 +0,0 @@
-{"0": {"3" : "UW"}}
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 92d332a..0322079 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -194,11 +194,6 @@ PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
 
-
-# Android DeviceAsWebcam specific overlay
-PRODUCT_PACKAGES += \
-    DeviceAsWebcamBluejay
-
 # SKU specific RROs
 PRODUCT_PACKAGES += \
     SettingsOverlayGB17L \