diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-11 22:00:34 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-11 22:00:34 +0000 |
commit | 9e58dbf4b23747ebf7987790db176cc5dd06574a (patch) | |
tree | 369112c76cbd85e24986bb24cacdd11473e2535d | |
parent | 3ae2ebb35a57d01e408b2bb0bec3527a477c75fc (diff) | |
parent | 7ca0bc89820f23b0ee2c0bbe501107381960fb00 (diff) | |
download | pantah-9e58dbf4b23747ebf7987790db176cc5dd06574a.tar.gz |
Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main
* changes:
Revert^2 "pantah(nfc): Modify NFC overlays for NFC apex"
Revert^2 "pantah: Replace NFC app with NFC apex"
-rw-r--r-- | cheetah/rro_overlays/NfcOverlay/Android.bp | 9 | ||||
-rw-r--r-- | cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml | 27 | ||||
-rw-r--r-- | cheetah/rro_overlays/NfcOverlay/OWNERS | 2 | ||||
-rw-r--r-- | cheetah/rro_overlays/NfcOverlay/res/values/config.xml | 35 | ||||
-rw-r--r-- | device-cheetah.mk | 5 | ||||
-rw-r--r-- | device-cloudripper.mk | 2 | ||||
-rw-r--r-- | device-panther.mk | 5 | ||||
-rw-r--r-- | device-ravenclaw.mk | 2 | ||||
-rw-r--r-- | panther/rro_overlays/NfcOverlay/Android.bp | 9 | ||||
-rw-r--r-- | panther/rro_overlays/NfcOverlay/AndroidManifest.xml | 27 | ||||
-rw-r--r-- | panther/rro_overlays/NfcOverlay/OWNERS | 2 | ||||
-rw-r--r-- | panther/rro_overlays/NfcOverlay/res/values/config.xml | 35 |
12 files changed, 154 insertions, 6 deletions
diff --git a/cheetah/rro_overlays/NfcOverlay/Android.bp b/cheetah/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..83a878d --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_pantah_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayCheetah", + sdk_version: "current", + product_specific: true +} diff --git a/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ +<?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/cheetah/rro_overlays/NfcOverlay/OWNERS b/cheetah/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..0055264 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2021 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. +--> +<resources> + <bool name="nfcc_always_on_allowed">true</bool> + <bool name="polling_disable_allowed">true</bool> + <string-array name="config_skuSupportsSecureNfc" translatable="false"> + <item>GP4BC</item> + <item>GE2AE</item> + <item>GFE4J</item> + </string-array> + <bool name="tag_intent_app_pref_supported">true</bool> + <!-- NFC Antenna Location API --> + <integer name="device_width">75</integer> + <integer name="device_height">160</integer> + <bool name="device_foldable">false</bool> + <integer-array name="antenna_x"> + <item>38</item> + </integer-array> + <integer-array name="antenna_y"> + <item>100</item> + </integer-array> +</resources> diff --git a/device-cheetah.mk b/device-cheetah.mk index 83c6a4b..8f879ae 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -108,9 +108,10 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci-cheetah.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayCheetah # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index a9e08fa..145de08 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -62,7 +62,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-panther.mk b/device-panther.mk index aff4d8c..07aa48b 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -87,9 +87,10 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci-panther.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayPanther # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index b3607e7..0f3af6d 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -66,7 +66,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/panther/rro_overlays/NfcOverlay/Android.bp b/panther/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..a1d3b96 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_pantah_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayPanther", + sdk_version: "current", + product_specific: true +} diff --git a/panther/rro_overlays/NfcOverlay/AndroidManifest.xml b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ +<?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/panther/rro_overlays/NfcOverlay/OWNERS b/panther/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/panther/rro_overlays/NfcOverlay/res/values/config.xml b/panther/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..d5bfd3d --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2021 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. +--> +<resources> + <bool name="nfcc_always_on_allowed">false</bool> + <bool name="polling_disable_allowed">true</bool> + <string-array name="config_skuSupportsSecureNfc" translatable="false"> + <item>GQML3</item> + <item>GVU6C</item> + <item>G03Z5</item> + </string-array> + <bool name="tag_intent_app_pref_supported">true</bool> + <!-- NFC Antenna Location API --> + <integer name="device_width">70</integer> + <integer name="device_height">150</integer> + <bool name="device_foldable">false</bool> + <integer-array name="antenna_x"> + <item>38</item> + </integer-array> + <integer-array name="antenna_y"> + <item>97</item> + </integer-array> +</resources> |