diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-11 22:18:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-11 22:18:24 +0000 |
commit | 5a9a08e93cc097d4f850784d79a975c009362741 (patch) | |
tree | c2e5730a0646e83804696051cf0835b8f7b97547 | |
parent | 3dbc00c7f95a97b58c0f94036e8043925fa78f8a (diff) | |
parent | d2720aa47f940e779bf2b061a2c451ee6d2681ea (diff) | |
download | raviole-5a9a08e93cc097d4f850784d79a975c009362741.tar.gz |
Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main am: d2720aa47f
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2863349
Change-Id: Ifb4f0d752ecf44994a596f9ace793eccd08672d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | device-oriole.mk | 3 | ||||
-rw-r--r-- | device-raven.mk | 3 | ||||
-rw-r--r-- | oriole/rro_overlays/NfcOverlay/Android.bp | 9 | ||||
-rw-r--r-- | oriole/rro_overlays/NfcOverlay/AndroidManifest.xml | 27 | ||||
-rw-r--r-- | oriole/rro_overlays/NfcOverlay/OWNERS | 2 | ||||
-rw-r--r-- | oriole/rro_overlays/NfcOverlay/res/values/config.xml | 35 | ||||
-rw-r--r-- | raven/rro_overlays/NfcOverlay/Android.bp | 9 | ||||
-rw-r--r-- | raven/rro_overlays/NfcOverlay/AndroidManifest.xml | 27 | ||||
-rw-r--r-- | raven/rro_overlays/NfcOverlay/OWNERS | 2 | ||||
-rw-r--r-- | raven/rro_overlays/NfcOverlay/res/values/config.xml | 35 |
10 files changed, 150 insertions, 2 deletions
diff --git a/device-oriole.mk b/device-oriole.mk index 697199a1..9a011086 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -135,7 +135,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayOriole # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 4ca202b4..b4b400a3 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -142,7 +142,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayRaven # SecureElement PRODUCT_PACKAGES += \ diff --git a/oriole/rro_overlays/NfcOverlay/Android.bp b/oriole/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 00000000..80de8916 --- /dev/null +++ b/oriole/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_raviole_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayOriole", + sdk_version: "current", + product_specific: true +} diff --git a/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml b/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 00000000..5241aa4a --- /dev/null +++ b/oriole/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/oriole/rro_overlays/NfcOverlay/OWNERS b/oriole/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 00000000..35e9713f --- /dev/null +++ b/oriole/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/oriole/rro_overlays/NfcOverlay/res/values/config.xml b/oriole/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 00000000..d1f5832c --- /dev/null +++ b/oriole/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>G9S9B</item> + <item>GB7N6</item> + <item>GR1YH</item> + </string-array> + <bool name="tag_intent_app_pref_supported">true</bool> + <!-- NFC Antenna Location API --> + <integer name="device_width">72</integer> + <integer name="device_height">157</integer> + <bool name="device_foldable">false</bool> + <integer-array name="antenna_x"> + <item>36</item> + </integer-array> + <integer-array name="antenna_y"> + <item>106</item> + </integer-array> +</resources> diff --git a/raven/rro_overlays/NfcOverlay/Android.bp b/raven/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 00000000..85b298c3 --- /dev/null +++ b/raven/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_raviole_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayRaven", + sdk_version: "current", + product_specific: true +} diff --git a/raven/rro_overlays/NfcOverlay/AndroidManifest.xml b/raven/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 00000000..5241aa4a --- /dev/null +++ b/raven/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/raven/rro_overlays/NfcOverlay/OWNERS b/raven/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 00000000..35e9713f --- /dev/null +++ b/raven/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/raven/rro_overlays/NfcOverlay/res/values/config.xml b/raven/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 00000000..e17a0a22 --- /dev/null +++ b/raven/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>G8V0U</item> + <item>GF5KQ</item> + <item>GLU0G</item> + </string-array> + <bool name="tag_intent_app_pref_supported">true</bool> + <!-- NFC Antenna Location API --> + <integer name="device_width">72</integer> + <integer name="device_height">167</integer> + <bool name="device_foldable">false</bool> + <integer-array name="antenna_x"> + <item>36</item> + </integer-array> + <integer-array name="antenna_y"> + <item>106</item> + </integer-array> +</resources> |