From 3956c2a35ae80ddfc44c2a06750dceaa6c8fdf68 Mon Sep 17 00:00:00 2001
From: SGCMarkus <markusornik@gmail.com>
Date: Thu, 19 Oct 2023 11:37:13 +0200
Subject: [PATCH] Revert "rtwo: mark android.software.nfc.beam as unavailable"

This reverts commit 9c818feb32556a3db67ec6c8540403b30f64e459.

This feature is gone in A14 completely, no need to mark it as
unavailable.

Change-Id: Ia99235cff45955bca967bc0321290ffaced2114f
---
 configs/unavail.android.software.nfc.beam.xml | 4 ----
 device.mk                                     | 3 ---
 2 files changed, 7 deletions(-)
 delete mode 100644 configs/unavail.android.software.nfc.beam.xml

diff --git a/configs/unavail.android.software.nfc.beam.xml b/configs/unavail.android.software.nfc.beam.xml
deleted file mode 100644
index 6500e12..0000000
--- a/configs/unavail.android.software.nfc.beam.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <unavailable-feature name="android.sofware.nfc.beam"/>
-</permissions>
diff --git a/device.mk b/device.mk
index 3dfbb9a..5bb319a 100644
--- a/device.mk
+++ b/device.mk
@@ -92,9 +92,6 @@ PRODUCT_PACKAGES += \
     Tag
 
 # Permissions
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/unavail.android.software.nfc.beam.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/unavail.android.software.nfc.beam.xml
-
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_dne/android.hardware.nfc.ese.xml \
     frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_dne/android.hardware.se.omapi.ese.xml \