Snap for 11186783 from 475f1f08a7 to 24Q1-release

Change-Id: Ifb2d7bb6caaf72bf61d2a1888b99ecf21cc90ef9
This commit is contained in:
Android Build Coastguard Worker
2023-12-07 00:02:41 +00:00
12 changed files with 156 additions and 3 deletions

View File

@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
device/google/shusky/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
@@ -429,3 +429,6 @@ PRODUCT_PACKAGES += shusky_assignable_devices.xml
# Enable DeviceAsWebcam support
PRODUCT_VENDOR_PROPERTIES += \
ro.usb.uvc.enabled=true
PRODUCT_PACKAGES += \
NfcOverlayHusky \

View File

@@ -67,7 +67,7 @@ PRODUCT_COPY_FILES += \
device/google/shusky/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

View File

@@ -68,7 +68,7 @@ PRODUCT_COPY_FILES += \
device/google/shusky/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
@@ -395,3 +395,6 @@ PRODUCT_PACKAGES += shusky_assignable_devices.xml
# Enable DeviceAsWebcam support
PRODUCT_VENDOR_PROPERTIES += \
ro.usb.uvc.enabled=true
PRODUCT_PACKAGES += \
NfcOverlayShiba

View File

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

View 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>

View File

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

View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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>GC3VE</item>
<item>G1MNW</item>
<item>GE9DP</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
<!-- NFC Antenna Location API -->
<integer name="device_width">73</integer>
<integer name="device_height">158</integer>
<bool name="device_foldable">false</bool>
<integer-array name="antenna_x">
<item>37</item>
</integer-array>
<integer-array name="antenna_y">
<item>103</item>
</integer-array>
</resources>

View File

@@ -20,6 +20,7 @@
<item>GKWS6</item>
<item>GZPF0</item>
<item>GPJ41</item>
<item>G9BQD</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
<!-- NFC Antenna Location API -->

View File

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

View 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>

View File

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

View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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>GKWS6</item>
<item>GZPF0</item>
<item>GPJ41</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
<!-- NFC Antenna Location API -->
<integer name="device_width">68</integer>
<integer name="device_height">146</integer>
<bool name="device_foldable">false</bool>
<integer-array name="antenna_x">
<item>34</item>
</integer-array>
<integer-array name="antenna_y">
<item>97</item>
</integer-array>
</resources>