diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:45:06 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:45:06 +0000 |
commit | 047c1770e609eaea8d7a4bf1cc00a2b10dc262e5 (patch) | |
tree | 051f8fba23cde78146005c84cab5bcf0b73acb5f | |
parent | bd369a5366db2617c33bcd4858f76ac32d60819c (diff) | |
parent | 0222c2951b94d87e1c4c8ed7602722dfdf12fae4 (diff) | |
download | barbet-simpleperf-release.tar.gz |
Snap for 11400057 from 0222c2951b94d87e1c4c8ed7602722dfdf12fae4 to simpleperf-releasesimpleperf-release
Change-Id: I6c4a9cd8e1c12e5744cd5e438644569b84f31082
-rw-r--r-- | barbet/rro_overlays/NfcOverlay/Android.bp | 9 | ||||
-rw-r--r-- | barbet/rro_overlays/NfcOverlay/AndroidManifest.xml | 27 | ||||
-rw-r--r-- | barbet/rro_overlays/NfcOverlay/OWNERS | 2 | ||||
-rw-r--r-- | barbet/rro_overlays/NfcOverlay/res/values/config.xml | 38 | ||||
-rw-r--r-- | device-barbet.mk | 10 | ||||
-rw-r--r-- | usb/usb/Usb.cpp | 2 |
6 files changed, 86 insertions, 2 deletions
diff --git a/barbet/rro_overlays/NfcOverlay/Android.bp b/barbet/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..e48a299 --- /dev/null +++ b/barbet/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_barbet_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayBarbet", + sdk_version: "current", + product_specific: true +} diff --git a/barbet/rro_overlays/NfcOverlay/AndroidManifest.xml b/barbet/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/barbet/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/barbet/rro_overlays/NfcOverlay/OWNERS b/barbet/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/barbet/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/barbet/rro_overlays/NfcOverlay/res/values/config.xml b/barbet/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..1059085 --- /dev/null +++ b/barbet/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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="enable_antenna_blocked_alert">false</bool> + <integer name="max_antenna_blocked_failure_count">10</integer> + <integer name="unknown_tag_polling_delay">2000</integer> + <string name="antenna_blocked_alert_link" translatable="false">https://support.google.com/pixelphone?p=nfc_tag_notification</string> + <string-array name="config_skuSupportsSecureNfc" translatable="false"> + <item>GBW2G</item> + <item>G1F8F</item> + <item>GR0M2</item> + <item>G4S1M</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">155</integer> + <bool name="device_foldable">false</bool> + <integer-array name="antenna_x"> + <item>36</item> + </integer-array> + <integer-array name="antenna_y"> + <item>91</item> + </integer-array> +</resources> diff --git a/device-barbet.mk b/device-barbet.mk index fb77663..1342413 100644 --- a/device-barbet.mk +++ b/device-barbet.mk @@ -38,7 +38,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch_with_ven # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=48 + ro.vendor.build.svn=50 # Enable watchdog timeout loop breaker. PRODUCT_PROPERTY_OVERRIDES += \ @@ -136,6 +136,11 @@ PRODUCT_PRODUCT_PROPERTIES +=\ ro.vendor.vibrator.hal.lptrigger=0 +# Quick Start device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + ro.quick_start.oem_id=00e0 \ + ro.quick_start.device_id=barbet + # Dumpstate HAL PRODUCT_PACKAGES += \ android.hardware.dumpstate@1.1-service.barbet @@ -210,3 +215,6 @@ PRODUCT_COPY_FILES += \ # Workaround for Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat + +PRODUCT_PACKAGES += \ + NfcOverlayBarbet diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index ed358cd..7abf239 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -93,7 +93,7 @@ ScopedAStatus Usb::enableUsbData(const string& in_portName, bool in_enable, } if (!WriteStringToFile("0", USB_DATA_PATH)) { - ALOGE("Not able to turn on usb connection notification"); + ALOGE("Not able to turn off usb connection notification"); result = false; } } |