From d92852d6470408275fb7e4072188e70ca316c27a Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Sat, 4 Nov 2023 19:00:59 +0000
Subject: [PATCH] Revert "shusky(nfc): Modify NFC overlays for NFC apex"

Revert submission 25189355-nfc_overlay

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:25189355-nfc_overlay

Bug: 309117462
Change-Id: I08a0c9967cd5da77d59ef60627b793efcf2d8377
Test: Compiles, device boots up
---
 device-husky.mk                               |  3 ---
 device-shiba.mk                               |  3 ---
 .../packages/apps/Nfc}/res/values/config.xml  |  0
 husky/rro_overlays/NfcOverlay/Android.bp      |  9 -------
 .../NfcOverlay/AndroidManifest.xml            | 27 -------------------
 husky/rro_overlays/NfcOverlay/OWNERS          |  2 --
 .../packages/apps/Nfc}/res/values/config.xml  |  0
 shiba/rro_overlays/NfcOverlay/Android.bp      |  9 -------
 .../NfcOverlay/AndroidManifest.xml            | 27 -------------------
 shiba/rro_overlays/NfcOverlay/OWNERS          |  2 --
 10 files changed, 82 deletions(-)
 rename husky/{rro_overlays/NfcOverlay => overlay/packages/apps/Nfc}/res/values/config.xml (100%)
 delete mode 100644 husky/rro_overlays/NfcOverlay/Android.bp
 delete mode 100644 husky/rro_overlays/NfcOverlay/AndroidManifest.xml
 delete mode 100644 husky/rro_overlays/NfcOverlay/OWNERS
 rename shiba/{rro_overlays/NfcOverlay => overlay/packages/apps/Nfc}/res/values/config.xml (100%)
 delete mode 100644 shiba/rro_overlays/NfcOverlay/Android.bp
 delete mode 100644 shiba/rro_overlays/NfcOverlay/AndroidManifest.xml
 delete mode 100644 shiba/rro_overlays/NfcOverlay/OWNERS

diff --git a/device-husky.mk b/device-husky.mk
index 03ff989..9525f68 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -427,6 +427,3 @@ PRODUCT_PACKAGES += shusky_assignable_devices.xml
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
-
-PRODUCT_PACKAGES += \
-	NfcOverlayHusky \
diff --git a/device-shiba.mk b/device-shiba.mk
index 6b2a4a0..507fa9c 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -393,6 +393,3 @@ PRODUCT_PACKAGES += shusky_assignable_devices.xml
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
-
-PRODUCT_PACKAGES += \
-    NfcOverlayShiba
diff --git a/husky/rro_overlays/NfcOverlay/res/values/config.xml b/husky/overlay/packages/apps/Nfc/res/values/config.xml
similarity index 100%
rename from husky/rro_overlays/NfcOverlay/res/values/config.xml
rename to husky/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/husky/rro_overlays/NfcOverlay/Android.bp b/husky/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index 826630f..0000000
--- a/husky/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["device_google_shusky_license"],
-}
-
-runtime_resource_overlay {
-    name: "NfcOverlayHusky",
-    sdk_version: "current",
-    product_specific: true
-}
diff --git a/husky/rro_overlays/NfcOverlay/AndroidManifest.xml b/husky/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4..0000000
--- a/husky/rro_overlays/NfcOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<!-- Pixel specific nfc overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.nfc.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.nfc"
-      android:targetName="NfcCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/husky/rro_overlays/NfcOverlay/OWNERS b/husky/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713..0000000
--- a/husky/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
diff --git a/shiba/rro_overlays/NfcOverlay/res/values/config.xml b/shiba/overlay/packages/apps/Nfc/res/values/config.xml
similarity index 100%
rename from shiba/rro_overlays/NfcOverlay/res/values/config.xml
rename to shiba/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/shiba/rro_overlays/NfcOverlay/Android.bp b/shiba/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index 065e971..0000000
--- a/shiba/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["device_google_shusky_license"],
-}
-
-runtime_resource_overlay {
-    name: "NfcOverlayShiba",
-    sdk_version: "current",
-    product_specific: true
-}
diff --git a/shiba/rro_overlays/NfcOverlay/AndroidManifest.xml b/shiba/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4..0000000
--- a/shiba/rro_overlays/NfcOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<!-- Pixel specific nfc overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.nfc.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.nfc"
-      android:targetName="NfcCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/shiba/rro_overlays/NfcOverlay/OWNERS b/shiba/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713..0000000
--- a/shiba/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS