Revert "bluejay(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: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
Change-Id: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
This commit is contained in:
Roshan Pius 2023-11-04 18:59:20 +00:00
parent 37718485f2
commit a940645a6e
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 += \