From 93e2530f355c34dba4f5f364673a61e904388174 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Fri, 1 Dec 2023 19:19:56 +0000
Subject: [PATCH] Revert^2 "shusky(nfc): Modify NFC overlays for NFC apex"

d92852d6470408275fb7e4072188e70ca316c27a

Bug: 303286040
Test: Compiles

Change-Id: Id67a6514a7d3f0359d95aa06c31cb694e9b35ffa
---
 device-husky.mk                               |  3 ++
 device-shiba.mk                               |  3 ++
 husky/rro_overlays/NfcOverlay/Android.bp      |  9 +++++
 .../NfcOverlay/AndroidManifest.xml            | 27 ++++++++++++++
 husky/rro_overlays/NfcOverlay/OWNERS          |  2 ++
 .../NfcOverlay/res/values/config.xml          | 35 +++++++++++++++++++
 shiba/rro_overlays/NfcOverlay/Android.bp      |  9 +++++
 .../NfcOverlay/AndroidManifest.xml            | 27 ++++++++++++++
 shiba/rro_overlays/NfcOverlay/OWNERS          |  2 ++
 .../NfcOverlay/res/values/config.xml          | 35 +++++++++++++++++++
 10 files changed, 152 insertions(+)
 create mode 100644 husky/rro_overlays/NfcOverlay/Android.bp
 create mode 100644 husky/rro_overlays/NfcOverlay/AndroidManifest.xml
 create mode 100644 husky/rro_overlays/NfcOverlay/OWNERS
 create mode 100644 husky/rro_overlays/NfcOverlay/res/values/config.xml
 create mode 100644 shiba/rro_overlays/NfcOverlay/Android.bp
 create mode 100644 shiba/rro_overlays/NfcOverlay/AndroidManifest.xml
 create mode 100644 shiba/rro_overlays/NfcOverlay/OWNERS
 create mode 100644 shiba/rro_overlays/NfcOverlay/res/values/config.xml

diff --git a/device-husky.mk b/device-husky.mk
index 976e835..529f963 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -429,3 +429,6 @@ 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 ac1ec32..b527ac6 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -395,3 +395,6 @@ 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/Android.bp b/husky/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..826630f
--- /dev/null
+++ b/husky/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000..5241aa4
--- /dev/null
+++ b/husky/rro_overlays/NfcOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?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
new file mode 100644
index 0000000..35e9713
--- /dev/null
+++ b/husky/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/husky/rro_overlays/NfcOverlay/res/values/config.xml b/husky/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 0000000..20edf75
--- /dev/null
+++ b/husky/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<resources>
+  <bool name="nfcc_always_on_allowed">false</bool>
+  <bool name="polling_disable_allowed">true</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>GC3VE</item>
+    <item>G1MNW</item>
+    <item>GE9DP</item>
+  </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
+  <!-- NFC Antenna Location API -->
+  <integer name="device_width">73</integer>
+  <integer name="device_height">158</integer>
+  <bool name="device_foldable">false</bool>
+  <integer-array name="antenna_x">
+    <item>37</item>
+  </integer-array>
+  <integer-array name="antenna_y">
+    <item>103</item>
+  </integer-array>
+</resources>
diff --git a/shiba/rro_overlays/NfcOverlay/Android.bp b/shiba/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..065e971
--- /dev/null
+++ b/shiba/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000..5241aa4
--- /dev/null
+++ b/shiba/rro_overlays/NfcOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?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
new file mode 100644
index 0000000..35e9713
--- /dev/null
+++ b/shiba/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/shiba/rro_overlays/NfcOverlay/res/values/config.xml b/shiba/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 0000000..5bdeca6
--- /dev/null
+++ b/shiba/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<resources>
+  <bool name="nfcc_always_on_allowed">false</bool>
+  <bool name="polling_disable_allowed">true</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>GKWS6</item>
+    <item>GZPF0</item>
+    <item>GPJ41</item>
+  </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
+  <!-- NFC Antenna Location API -->
+  <integer name="device_width">68</integer>
+  <integer name="device_height">146</integer>
+  <bool name="device_foldable">false</bool>
+  <integer-array name="antenna_x">
+    <item>34</item>
+  </integer-array>
+  <integer-array name="antenna_y">
+    <item>97</item>
+  </integer-array>
+</resources>