Merge "Enable observe mode support in NFC" into main

5 files changed, 57 insertions, 0 deletions

diff --git a/apex/com.google.aosp_cf.rros/Android.bp b/apex/com.google.aosp_cf.rros/Android.bp
index acb3add46..cc325cb82 100644
--- a/apex/com.google.aosp_cf.rros/Android.bp
+++ b/apex/com.google.aosp_cf.rros/Android.bp
@@ -29,6 +29,7 @@ apex {
     rros: [
         "cuttlefish_overlay_connectivity",
         "cuttlefish_overlay_frameworks_base_core",
+        "cuttlefish_overlay_nfc",
         "cuttlefish_overlay_settings_provider",
     ],
 }
diff --git a/shared/overlays/nfc/Android.bp b/shared/overlays/nfc/Android.bp
new file mode 100644
index 000000000..dd5186390
--- /dev/null
+++ b/shared/overlays/nfc/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "cuttlefish_overlay_nfc",
+    sdk_version: "current",
+    product_specific: true,
+}
diff --git a/shared/overlays/nfc/AndroidManifest.xml b/shared/overlays/nfc/AndroidManifest.xml
new file mode 100644
index 000000000..9aa204f64
--- /dev/null
+++ b/shared/overlays/nfc/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.cuttlefish.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/shared/overlays/nfc/OWNERS b/shared/overlays/nfc/OWNERS
new file mode 100644
index 000000000..35e9713f5
--- /dev/null
+++ b/shared/overlays/nfc/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/shared/overlays/nfc/res/values/config.xml b/shared/overlays/nfc/res/values/config.xml
new file mode 100644
index 000000000..4f822693b
--- /dev/null
+++ b/shared/overlays/nfc/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 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="nfc_observe_mode_supported">true</bool>
+</resources>