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

This reverts commit 24f43348a935f2d678f916bb66c7cd07fb7f9ce9.

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

Bug: 300166920

Change-Id: Ic5254d9c5ace2b3ce7b4841078fa5ce43b3d9eef
---
 device-lynx.mk                                |  4 ---
 rro_overlays/DeviceAsWebcamOverlay/Android.bp | 10 --------
 .../DeviceAsWebcamOverlay/AndroidManifest.xml | 25 -------------------
 rro_overlays/DeviceAsWebcamOverlay/OWNERS     |  1 -
 .../res/raw/physical_camera_mapping.json      |  1 -
 5 files changed, 41 deletions(-)
 delete mode 100644 rro_overlays/DeviceAsWebcamOverlay/Android.bp
 delete mode 100644 rro_overlays/DeviceAsWebcamOverlay/AndroidManifest.xml
 delete mode 100644 rro_overlays/DeviceAsWebcamOverlay/OWNERS
 delete mode 100644 rro_overlays/DeviceAsWebcamOverlay/res/raw/physical_camera_mapping.json

diff --git a/device-lynx.mk b/device-lynx.mk
index 8fa0aa5..5b34744 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -223,10 +223,6 @@ PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
 
-# Android DeviceAsWebcam specific overlay
-PRODUCT_PACKAGES += \
-    DeviceAsWebcamLynx
-
 # MIPI Coex Configs
 PRODUCT_COPY_FILES += \
     device/google/lynx/lynx/radio/lynx_display_primary_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv
diff --git a/rro_overlays/DeviceAsWebcamOverlay/Android.bp b/rro_overlays/DeviceAsWebcamOverlay/Android.bp
deleted file mode 100644
index 697b4ef..0000000
--- a/rro_overlays/DeviceAsWebcamOverlay/Android.bp
+++ /dev/null
@@ -1,10 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-runtime_resource_overlay {
-    name: "DeviceAsWebcamLynx",
-    certificate: "platform",
-    product_specific: true,
-    sdk_version: "current",
-}
diff --git a/rro_overlays/DeviceAsWebcamOverlay/AndroidManifest.xml b/rro_overlays/DeviceAsWebcamOverlay/AndroidManifest.xml
deleted file mode 100644
index 0b3260c..0000000
--- a/rro_overlays/DeviceAsWebcamOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<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/rro_overlays/DeviceAsWebcamOverlay/OWNERS b/rro_overlays/DeviceAsWebcamOverlay/OWNERS
deleted file mode 100644
index f48a95c..0000000
--- a/rro_overlays/DeviceAsWebcamOverlay/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-include platform/frameworks/av:/camera/OWNERS
diff --git a/rro_overlays/DeviceAsWebcamOverlay/res/raw/physical_camera_mapping.json b/rro_overlays/DeviceAsWebcamOverlay/res/raw/physical_camera_mapping.json
deleted file mode 100644
index d847e25..0000000
--- a/rro_overlays/DeviceAsWebcamOverlay/res/raw/physical_camera_mapping.json
+++ /dev/null
@@ -1 +0,0 @@
-{"0": {"3" : "UW"}}