From 3000cdee0ef5284ba9fdc68bcdebedbcceb65b10 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 14:58:26 +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 Change-Id: I9adf4d5adf38a986fb95ca43e307914ae7439394 Test: Compiles, device boots up --- 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 6296386..17d8400 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -111,7 +111,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci-cheetah.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st \ NfcOverlayCheetah diff --git a/device-cloudripper.mk b/device-cloudripper.mk index aa386b3..8b2b419 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -65,7 +65,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 diff --git a/device-panther.mk b/device-panther.mk index bfdd620..4c2ed9d 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -90,7 +90,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci-panther.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st \ NfcOverlayPanther diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index b05f844..d6da01d 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -69,7 +69,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