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

Revert "pantah(nfc): Modify NFC overlays for NFC apex"

Browse source 
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
(cherry picked from https://android-review.googlesource.com/q/commit:883343a5e59ad915cef349ac21c18b1470dbb777)
Merged-In: Idced173f9063bed7899354d20553b3694579329a
Change-Id: Idced173f9063bed7899354d20553b3694579329a
This commit is contained in:
Roshan Pius 2023-11-04 19:04:54 +00:00
parent 3000cdee0e
commit 08fbfb05f1
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

@ -113,8 +113,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

@ -92,8 +92,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