Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e am: 033e515e0a

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124

Change-Id: I644d4b2f369e336ab0c1929ddaaef8f327361504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Roshan Pius 2023-11-08 22:46:05 +00:00 committed by Automerger Merge Worker
commit 7c287ce810
5 changed files with 1 additions and 40 deletions

View file

@ -1,9 +0,0 @@
package {
default_applicable_licenses: ["device_google_bluejay_license"],
}
runtime_resource_overlay {
name: "NfcOverlayBluejay",
sdk_version: "current",
product_specific: true
}

View file

@ -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>

View file

@ -1,2 +0,0 @@
# Bug component: 48448
include platform/packages/apps/Nfc:/OWNERS

View file

@ -102,8 +102,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
com.android.nfcservices \ com.android.nfcservices \
Tag \ Tag \
android.hardware.nfc-service.st \ android.hardware.nfc-service.st
NfcOverlayBluejay
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \