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

Revert submission 2802548-nfc_apex

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:2802548-nfc_apex

Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://android-review.googlesource.com/q/commit:9b9ed35e2791458c36b792ee049972c978b75606)
Merged-In: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
Change-Id: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
---
 device-felix.mk                               |  3 +--
 .../packages/apps/Nfc}/res/values/config.xml  |  0
 rro_overlays/NfcOverlay/Android.bp            |  9 -------
 rro_overlays/NfcOverlay/AndroidManifest.xml   | 27 -------------------
 rro_overlays/NfcOverlay/OWNERS                |  2 --
 5 files changed, 1 insertion(+), 40 deletions(-)
 rename {rro_overlays/NfcOverlay => felix/overlay/packages/apps/Nfc}/res/values/config.xml (100%)
 delete mode 100644 rro_overlays/NfcOverlay/Android.bp
 delete mode 100644 rro_overlays/NfcOverlay/AndroidManifest.xml
 delete mode 100644 rro_overlays/NfcOverlay/OWNERS

diff --git a/device-felix.mk b/device-felix.mk
index 1708660..3680bee 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -102,8 +102,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	com.android.nfcservices \
 	Tag \
-	android.hardware.nfc-service.st \
-	NfcOverlayFelix
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/felix/overlay/packages/apps/Nfc/res/values/config.xml
similarity index 100%
rename from rro_overlays/NfcOverlay/res/values/config.xml
rename to felix/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index 580f845..0000000
--- a/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["device_google_felix_license"],
-}
-
-runtime_resource_overlay {
-    name: "NfcOverlayFelix",
-    sdk_version: "current",
-    product_specific: true
-}
diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4..0000000
--- a/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/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713..0000000
--- a/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS