From a940645a6efd505b9788823af31c79c790618233 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Sat, 4 Nov 2023 18:59:20 +0000
Subject: [PATCH 1/2] Revert "bluejay(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
Merged-In: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
Change-Id: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
---
 .../packages/apps/Nfc}/res/values/config.xml  |  0
 bluejay/rro_overlays/NfcOverlay/Android.bp    |  9 -------
 .../NfcOverlay/AndroidManifest.xml            | 27 -------------------
 bluejay/rro_overlays/NfcOverlay/OWNERS        |  2 --
 device-bluejay.mk                             |  3 +--
 5 files changed, 1 insertion(+), 40 deletions(-)
 rename bluejay/{rro_overlays/NfcOverlay => overlay/packages/apps/Nfc}/res/values/config.xml (100%)
 delete mode 100644 bluejay/rro_overlays/NfcOverlay/Android.bp
 delete mode 100644 bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml
 delete mode 100644 bluejay/rro_overlays/NfcOverlay/OWNERS

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

From b5ff2c83d38a733ea53e14678575c707d3b1cd7e Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Mon, 6 Nov 2023 19:35:51 +0000
Subject: [PATCH 2/2] Revert "bluejay: Replace NFC app with NFC apex"

Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056

Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75bff8a95f3e1fbeeaffce4d2fe720152761edbd)
Merged-In: Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6
Change-Id: Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6
---
 device-bluejay.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-bluejay.mk b/device-bluejay.mk
index 8a11401..dd53985 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -100,7 +100,7 @@ PRODUCT_COPY_FILES += \
 	device/google/bluejay/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
 	android.hardware.nfc-service.st