summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2023-11-04 18:59:20 +0000
committerRoshan Pius <rpius@google.com>2023-11-06 19:46:20 +0000
commitb21527bc6c69ee6d2f381596c12beab705db4f56 (patch)
tree8fd0dfcbcf318efaaba9229f7a9f908893ec4311
parente3ab1a70e661695f36c8ae0cf0271ddbad8a413f (diff)
downloadredfin-b21527bc6c69ee6d2f381596c12beab705db4f56.tar.gz
Revert "redfin(nfc): Modify NFC overlays for NFC apex"
Revert submission 2802548-nfc_apex Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:2802548-nfc_apex Bug: 309117462 Test: Compiles, device boots up Merged-In: Icb67edebd8c0579cd015fe8a8956ae45426002ae Change-Id: Icb67edebd8c0579cd015fe8a8956ae45426002ae
-rw-r--r--device-redfin.mk3
-rw-r--r--redfin/overlay/packages/apps/Nfc/res/values/config.xml (renamed from redfin/rro_overlays/NfcOverlay/res/values/config.xml)0
-rw-r--r--redfin/rro_overlays/NfcOverlay/Android.bp9
-rw-r--r--redfin/rro_overlays/NfcOverlay/AndroidManifest.xml27
-rw-r--r--redfin/rro_overlays/NfcOverlay/OWNERS2
5 files changed, 0 insertions, 41 deletions
diff --git a/device-redfin.mk b/device-redfin.mk
index ae4645e..6bd769c 100644
--- a/device-redfin.mk
+++ b/device-redfin.mk
@@ -247,6 +247,3 @@ endif
# Workaround for prebuilt Qualcomm neural network HAL
PRODUCT_PACKAGES += \
libprotobuf-cpp-full-3.9.1-vendorcompat
-
-PRODUCT_PACKAGES += \
- NfcOverlayRedfin
diff --git a/redfin/rro_overlays/NfcOverlay/res/values/config.xml b/redfin/overlay/packages/apps/Nfc/res/values/config.xml
index 3d2adaa..3d2adaa 100644
--- a/redfin/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/redfin/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/redfin/rro_overlays/NfcOverlay/Android.bp b/redfin/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index c08c3e3..0000000
--- a/redfin/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
- default_applicable_licenses: ["device_google_redfin_license"],
-}
-
-runtime_resource_overlay {
- name: "NfcOverlayRedfin",
- sdk_version: "current",
- product_specific: true
-}
diff --git a/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml b/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4..0000000
--- a/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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/redfin/rro_overlays/NfcOverlay/OWNERS b/redfin/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713..0000000
--- a/redfin/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS