Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main am: 9e58dbf4b2
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2864191 Change-Id: I83187ac18ba0c729644736e97f0ff01c240a9c8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
Automerger Merge Worker
commit
077e772133
10 changed files with 150 additions and 2 deletions
9
cheetah/rro_overlays/NfcOverlay/Android.bp
Normal file
9
cheetah/rro_overlays/NfcOverlay/Android.bp
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
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
Normal file
27
cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml
Normal file
|
|
@ -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>
|
||||||
2
cheetah/rro_overlays/NfcOverlay/OWNERS
Normal file
2
cheetah/rro_overlays/NfcOverlay/OWNERS
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
# Bug component: 48448
|
||||||
|
include platform/packages/apps/Nfc:/OWNERS
|
||||||
35
cheetah/rro_overlays/NfcOverlay/res/values/config.xml
Normal file
35
cheetah/rro_overlays/NfcOverlay/res/values/config.xml
Normal file
|
|
@ -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>
|
||||||
|
|
@ -110,7 +110,8 @@ PRODUCT_COPY_FILES += \
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
$(RELEASE_PACKAGE_NFC_STACK) \
|
$(RELEASE_PACKAGE_NFC_STACK) \
|
||||||
Tag \
|
Tag \
|
||||||
android.hardware.nfc-service.st
|
android.hardware.nfc-service.st \
|
||||||
|
NfcOverlayCheetah
|
||||||
|
|
||||||
# SecureElement
|
# SecureElement
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,8 @@ PRODUCT_COPY_FILES += \
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
$(RELEASE_PACKAGE_NFC_STACK) \
|
$(RELEASE_PACKAGE_NFC_STACK) \
|
||||||
Tag \
|
Tag \
|
||||||
android.hardware.nfc-service.st
|
android.hardware.nfc-service.st \
|
||||||
|
NfcOverlayPanther
|
||||||
|
|
||||||
# SecureElement
|
# SecureElement
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
|
|
|
||||||
9
panther/rro_overlays/NfcOverlay/Android.bp
Normal file
9
panther/rro_overlays/NfcOverlay/Android.bp
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
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
Normal file
27
panther/rro_overlays/NfcOverlay/AndroidManifest.xml
Normal file
|
|
@ -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>
|
||||||
2
panther/rro_overlays/NfcOverlay/OWNERS
Normal file
2
panther/rro_overlays/NfcOverlay/OWNERS
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
# Bug component: 48448
|
||||||
|
include platform/packages/apps/Nfc:/OWNERS
|
||||||
35
panther/rro_overlays/NfcOverlay/res/values/config.xml
Normal file
35
panther/rro_overlays/NfcOverlay/res/values/config.xml
Normal file
|
|
@ -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>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue