Evolution-X-Tensor/device_google_pantah
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "pantah(nfc): Modify NFC overlays for NFC apex"" into main am: 6efff16bfc am: b21db32598

Browse source 
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2818127

Change-Id: I8dc4e06695dafb980ac4c1adf2f5535abf51f2bd
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:25 +00:00 • committed by Automerger Merge Worker
commit a70f5a11f5
10 changed files with 2 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

0
cheetah/rro_overlays/NfcOverlay/res/values/config.xml → cheetah/overlay/packages/apps/Nfc/res/values/config.xml
View file

9
cheetah/rro_overlays/NfcOverlay/Android.bp
View file

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

27
cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml
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>

2
cheetah/rro_overlays/NfcOverlay/OWNERS
View file

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

3
device-cheetah.mk
View file

@ -110,8 +110,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
android.hardware.nfc-service.st \
NfcOverlayCheetah
android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \

3
device-panther.mk
View file

@ -89,8 +89,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
android.hardware.nfc-service.st \
NfcOverlayPanther
android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \

0
panther/rro_overlays/NfcOverlay/res/values/config.xml → panther/overlay/packages/apps/Nfc/res/values/config.xml
View file

9
panther/rro_overlays/NfcOverlay/Android.bp
View file

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

27
panther/rro_overlays/NfcOverlay/AndroidManifest.xml
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>

2
panther/rro_overlays/NfcOverlay/OWNERS
View file

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