From 703decc9702d2e3f3cab4d0c1820dd4a432b5380 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Mon, 6 Nov 2023 19:36:36 +0000 Subject: [PATCH] Revert "pantah: 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:3000cdee0ef5284ba9fdc68bcdebedbcceb65b10) Merged-In: I9adf4d5adf38a986fb95ca43e307914ae7439394 Change-Id: I9adf4d5adf38a986fb95ca43e307914ae7439394 --- device-cheetah.mk | 2 +- device-cloudripper.mk | 2 +- device-panther.mk | 2 +- device-ravenclaw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index d14d754..cefddc1 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -115,7 +115,7 @@ PRODUCT_COPY_FILES += \ endif PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st \ NfcOverlayCheetah diff --git a/device-cloudripper.mk b/device-cloudripper.mk index dc8a3d9..0a4dfc1 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -69,7 +69,7 @@ PRODUCT_COPY_FILES += \ endif PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st diff --git a/device-panther.mk b/device-panther.mk index 36c669f..14e0d90 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -94,7 +94,7 @@ PRODUCT_COPY_FILES += \ endif PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st \ NfcOverlayPanther diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 335dcdd..b3607e7 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -66,7 +66,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st