From 73675d0e25cd9e09102b9074ff1dae0083752807 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 29 Feb 2024 11:03:03 -0800
Subject: [PATCH 1/3] Remove unused Android.mk and rename to *.template

Test: make
Bug: 306790939
Change-Id: Idfaa30950ed814e0b1ae9d174c2f97ece11c0279
---
 self-extractors/Android.mk                                        | 0
 .../google_devices/staging/{Android.mk => Android.mk.template}    | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 self-extractors/Android.mk
 rename self-extractors/google_devices/staging/{Android.mk => Android.mk.template} (100%)

diff --git a/self-extractors/Android.mk b/self-extractors/Android.mk
deleted file mode 100644
index e69de29..0000000
diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk.template
similarity index 100%
rename from self-extractors/google_devices/staging/Android.mk
rename to self-extractors/google_devices/staging/Android.mk.template

From d1c56e42a21e7dd5d9ed047d7ad505692f28823b Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 29 Feb 2024 11:39:42 -0800
Subject: [PATCH 2/3] Set the blew prebuilt apps to PRESIGNED

BUG: 306790939
Change-Id: I4b3b9b3c5ebfd79b0821bff539a473a866b59bd8
---
 self-extractors/google_devices/staging/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk
index 2752bae..7ad5c0f 100644
--- a/self-extractors/google_devices/staging/Android.mk
+++ b/self-extractors/google_devices/staging/Android.mk
@@ -64,7 +64,7 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
+LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
 LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE

From 221c443d1e4712d9035d887cef3f6dc2d028367a Mon Sep 17 00:00:00 2001
From: Brad Lassey <lassey@google.com>
Date: Thu, 29 Feb 2024 15:28:37 +0000
Subject: [PATCH 3/3] Enabling Observe mode

Bug: 327601464
Test: Tested on local device
Change-Id: Id4cd402e06369075bdf15f833f39073029dfabdd
---
 rro_overlays/NfcOverlay/res/values/config.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml
index b6f04de..717cf7d 100644
--- a/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/rro_overlays/NfcOverlay/res/values/config.xml
@@ -33,4 +33,5 @@
   <integer-array name="antenna_y">
     <item>96</item>
   </integer-array>
+  <bool name="nfc_observe_mode_supported">true</bool>
 </resources>