From 939bea92e78a200f0845a84aac8c7363eeb84388 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 28 Mar 2023 14:58:12 +0900 Subject: [PATCH 01/15] Add hardware/qcom/wlan namespace With libwifi-hal-qcom migrated to Android.bp with soong namespace the namespace should be added to PRODUCT_SOONG_NAMESPACES as well. Bug: 273376293 Test: m droid Change-Id: I40b1fc997e8ad283f6ba0a024cb2110912c46034 --- device-redfin.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-redfin.mk b/device-redfin.mk index a1b9608..6bd769c 100644 --- a/device-redfin.mk +++ b/device-redfin.mk @@ -36,7 +36,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/compression_wit LOCAL_PATH := device/google/redfin PRODUCT_SOONG_NAMESPACES += \ - device/google/redfin + device/google/redfin \ + hardware/qcom/wlan/legacy DEVICE_PACKAGE_OVERLAYS += device/google/redfin/redfin/overlay From f2a26753724359698d6afeecfacb7b1d7f51199c Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 12 Jul 2023 23:07:55 +0000 Subject: [PATCH 02/15] device FCM -= android.* Bug: 290408770 Test: N/A Change-Id: I4b47171f62daebb85bb405e7a9713ef32c888913 --- vf/device_framework_matrix_product.R.5.xml | 25 ---------------------- vf/device_framework_matrix_product.S.5.xml | 25 ---------------------- 2 files changed, 50 deletions(-) diff --git a/vf/device_framework_matrix_product.R.5.xml b/vf/device_framework_matrix_product.R.5.xml index a00e40c..2984766 100644 --- a/vf/device_framework_matrix_product.R.5.xml +++ b/vf/device_framework_matrix_product.R.5.xml @@ -41,31 +41,6 @@ slot2 - - android.hardware.media.c2 - 1.0 - - IComponentStore - default - software - - - - android.hardware.radio - 1.2 - - ISap - slot2 - - - - android.hardware.radio.config - 1.1 - - IRadioConfig - default - - vendor.display.color 1.0-5 diff --git a/vf/device_framework_matrix_product.S.5.xml b/vf/device_framework_matrix_product.S.5.xml index 04114ed..22a1b7f 100644 --- a/vf/device_framework_matrix_product.S.5.xml +++ b/vf/device_framework_matrix_product.S.5.xml @@ -41,31 +41,6 @@ slot2 - - android.hardware.media.c2 - 1.0 - - IComponentStore - default - software - - - - android.hardware.radio - 1.2 - - ISap - slot2 - - - - android.hardware.radio.config - 1.1 - - IRadioConfig - default - - vendor.display.color 1.0-5 From ce844821504799413de6586bc79cb40e6c7d206a Mon Sep 17 00:00:00 2001 From: Roy Luo Date: Thu, 21 Sep 2023 20:09:14 +0000 Subject: [PATCH 03/15] usb: upgrade stats AIDL to v2 Upgrade stats AIDL to v2 following pixelstats lib. Bug: 297224564 Test: Build Change-Id: Iebc5cee69a21faa302a100d6efcf89b2a05e1bc0 --- usb/usb/Android.bp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp index 80a2824..d9ca00f 100644 --- a/usb/usb/Android.bp +++ b/usb/usb/Android.bp @@ -38,7 +38,7 @@ cc_binary { "android.hardware.usb.gadget@1.0", "android.hardware.usb-V1-ndk", "libcutils", - "android.frameworks.stats-V1-ndk", + "android.frameworks.stats-V2-ndk", "pixelatoms-cpp", "libbinder_ndk", @@ -48,7 +48,7 @@ cc_binary { "libpixelstats", ], export_shared_lib_headers: [ - "android.frameworks.stats-V1-ndk", + "android.frameworks.stats-V2-ndk", "pixelatoms-cpp", ], } From a219f1e78367c66c3c2c71481b085b04552b7d1b Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 3 Oct 2023 15:52:35 -0700 Subject: [PATCH 04/15] Add BUILD_BROKEN_INCORRECT_PARTITION_IMAGES Redfin has issues that prevent it from working with a hermetic partition build. Bug: 205632228 Test: Presubmits Change-Id: Id3dbfd1f7e25d346d5cd31ad04f3d8973889e472 --- redfin/BoardConfig.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/redfin/BoardConfig.mk b/redfin/BoardConfig.mk index 1bcb070..9e6d0ca 100644 --- a/redfin/BoardConfig.mk +++ b/redfin/BoardConfig.mk @@ -32,3 +32,5 @@ else -include vendor/google_devices/redfin/proprietary/BoardConfigVendor.mk endif + +BUILD_BROKEN_INCORRECT_PARTITION_IMAGES := true From e3ab1a70e661695f36c8ae0cf0271ddbad8a413f Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 25 Oct 2023 14:13:26 -0700 Subject: [PATCH 05/15] redfin(nfc): Modify NFC overlays for NFC apex Bug: 307763519 Test: Manual flash and tested the overlay values are taking effect. Change-Id: I8c995bcd3d0dd18ce6531f627d785f18abc81150 --- device-redfin.mk | 3 +++ redfin/rro_overlays/NfcOverlay/Android.bp | 9 +++++++ .../NfcOverlay/AndroidManifest.xml | 27 +++++++++++++++++++ redfin/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../NfcOverlay}/res/values/config.xml | 0 5 files changed, 41 insertions(+) create mode 100644 redfin/rro_overlays/NfcOverlay/Android.bp create mode 100644 redfin/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 redfin/rro_overlays/NfcOverlay/OWNERS rename redfin/{overlay/packages/apps/Nfc => rro_overlays/NfcOverlay}/res/values/config.xml (100%) diff --git a/device-redfin.mk b/device-redfin.mk index 6bd769c..ae4645e 100644 --- a/device-redfin.mk +++ b/device-redfin.mk @@ -247,3 +247,6 @@ endif # Workaround for prebuilt Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat + +PRODUCT_PACKAGES += \ + NfcOverlayRedfin diff --git a/redfin/rro_overlays/NfcOverlay/Android.bp b/redfin/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..c08c3e3 --- /dev/null +++ b/redfin/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_redfin_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayRedfin", + sdk_version: "current", + product_specific: true +} diff --git a/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml b/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/redfin/rro_overlays/NfcOverlay/OWNERS b/redfin/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/redfin/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/redfin/overlay/packages/apps/Nfc/res/values/config.xml b/redfin/rro_overlays/NfcOverlay/res/values/config.xml similarity index 100% rename from redfin/overlay/packages/apps/Nfc/res/values/config.xml rename to redfin/rro_overlays/NfcOverlay/res/values/config.xml From 1b54ce4db1a3c3ba067124a7e491ae29f8e50666 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Wed, 25 Oct 2023 16:31:29 -0600 Subject: [PATCH 06/15] Fix lunch choices for git_main We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch Change-Id: I400392ba9cf7e6d35af78d6b668d52abee27497d --- AndroidProducts.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 1dc1835..bea4981 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -22,5 +22,5 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_redfin_hwasan.mk \ COMMON_LUNCH_CHOICES := \ - aosp_redfin-userdebug \ - aosp_redfin_vf-userdebug \ + aosp_redfin-trunk_staging-userdebug \ + aosp_redfin_vf-trunk_staging-userdebug \ From 95edaa292e665b2ddb1cfe3cec98b47ebd7f2b54 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Mon, 30 Oct 2023 22:01:04 +0000 Subject: [PATCH 07/15] Fix lunch choices for git_main We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1b54ce4db1a3c3ba067124a7e491ae29f8e50666) Merged-In: I400392ba9cf7e6d35af78d6b668d52abee27497d Change-Id: I400392ba9cf7e6d35af78d6b668d52abee27497d --- AndroidProducts.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 1dc1835..bea4981 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -22,5 +22,5 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_redfin_hwasan.mk \ COMMON_LUNCH_CHOICES := \ - aosp_redfin-userdebug \ - aosp_redfin_vf-userdebug \ + aosp_redfin-trunk_staging-userdebug \ + aosp_redfin_vf-trunk_staging-userdebug \ From 3c2aa5f3a2d0f3c5642dc96c2edde201f84e8e7a Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 19:05:11 +0000 Subject: [PATCH 08/15] Revert "redfin(nfc): Modify NFC overlays for NFC apex" Revert submission 2802548-nfc_apex Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:2802548-nfc_apex Bug: 309117462 Test: Compiles, device boots up (cherry picked from https://android-review.googlesource.com/q/commit:af4a9967146824b1194f536ddb417b5f783806d7) Merged-In: Icb67edebd8c0579cd015fe8a8956ae45426002ae Change-Id: Icb67edebd8c0579cd015fe8a8956ae45426002ae --- device-redfin.mk | 3 --- .../packages/apps/Nfc}/res/values/config.xml | 0 redfin/rro_overlays/NfcOverlay/Android.bp | 9 ------- .../NfcOverlay/AndroidManifest.xml | 27 ------------------- redfin/rro_overlays/NfcOverlay/OWNERS | 2 -- 5 files changed, 41 deletions(-) rename redfin/{rro_overlays/NfcOverlay => overlay/packages/apps/Nfc}/res/values/config.xml (100%) delete mode 100644 redfin/rro_overlays/NfcOverlay/Android.bp delete mode 100644 redfin/rro_overlays/NfcOverlay/AndroidManifest.xml delete mode 100644 redfin/rro_overlays/NfcOverlay/OWNERS diff --git a/device-redfin.mk b/device-redfin.mk index ae4645e..6bd769c 100644 --- a/device-redfin.mk +++ b/device-redfin.mk @@ -247,6 +247,3 @@ endif # Workaround for prebuilt Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat - -PRODUCT_PACKAGES += \ - NfcOverlayRedfin diff --git a/redfin/rro_overlays/NfcOverlay/res/values/config.xml b/redfin/overlay/packages/apps/Nfc/res/values/config.xml similarity index 100% rename from redfin/rro_overlays/NfcOverlay/res/values/config.xml rename to redfin/overlay/packages/apps/Nfc/res/values/config.xml diff --git a/redfin/rro_overlays/NfcOverlay/Android.bp b/redfin/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index c08c3e3..0000000 --- a/redfin/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_redfin_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayRedfin", - sdk_version: "current", - product_specific: true -} diff --git a/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml b/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml deleted file mode 100644 index 5241aa4..0000000 --- a/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/redfin/rro_overlays/NfcOverlay/OWNERS b/redfin/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713..0000000 --- a/redfin/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS From b21527bc6c69ee6d2f381596c12beab705db4f56 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 18:59:20 +0000 Subject: [PATCH 09/15] Revert "redfin(nfc): Modify NFC overlays for NFC apex" Revert submission 2802548-nfc_apex Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:2802548-nfc_apex Bug: 309117462 Test: Compiles, device boots up Merged-In: Icb67edebd8c0579cd015fe8a8956ae45426002ae Change-Id: Icb67edebd8c0579cd015fe8a8956ae45426002ae --- device-redfin.mk | 3 --- .../packages/apps/Nfc}/res/values/config.xml | 0 redfin/rro_overlays/NfcOverlay/Android.bp | 9 ------- .../NfcOverlay/AndroidManifest.xml | 27 ------------------- redfin/rro_overlays/NfcOverlay/OWNERS | 2 -- 5 files changed, 41 deletions(-) rename redfin/{rro_overlays/NfcOverlay => overlay/packages/apps/Nfc}/res/values/config.xml (100%) delete mode 100644 redfin/rro_overlays/NfcOverlay/Android.bp delete mode 100644 redfin/rro_overlays/NfcOverlay/AndroidManifest.xml delete mode 100644 redfin/rro_overlays/NfcOverlay/OWNERS diff --git a/device-redfin.mk b/device-redfin.mk index ae4645e..6bd769c 100644 --- a/device-redfin.mk +++ b/device-redfin.mk @@ -247,6 +247,3 @@ endif # Workaround for prebuilt Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat - -PRODUCT_PACKAGES += \ - NfcOverlayRedfin diff --git a/redfin/rro_overlays/NfcOverlay/res/values/config.xml b/redfin/overlay/packages/apps/Nfc/res/values/config.xml similarity index 100% rename from redfin/rro_overlays/NfcOverlay/res/values/config.xml rename to redfin/overlay/packages/apps/Nfc/res/values/config.xml diff --git a/redfin/rro_overlays/NfcOverlay/Android.bp b/redfin/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index c08c3e3..0000000 --- a/redfin/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_redfin_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayRedfin", - sdk_version: "current", - product_specific: true -} diff --git a/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml b/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml deleted file mode 100644 index 5241aa4..0000000 --- a/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/redfin/rro_overlays/NfcOverlay/OWNERS b/redfin/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713..0000000 --- a/redfin/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS From 494c9cdfa1420575c932c8bda70b562793b8f551 Mon Sep 17 00:00:00 2001 From: YiKai Peng Date: Tue, 14 Nov 2023 09:48:51 +0000 Subject: [PATCH 10/15] WLC: update AIDL manifest version to 2 Bug: 310109332 Test: Build/Flash Change-Id: Iecf289f931d1a5280d83de65779e6b5dc3763ef0 Signed-off-by: YiKai Peng --- wireless_charger/compatibility_matrix.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireless_charger/compatibility_matrix.xml b/wireless_charger/compatibility_matrix.xml index d0adcde..370d8fb 100644 --- a/wireless_charger/compatibility_matrix.xml +++ b/wireless_charger/compatibility_matrix.xml @@ -1,7 +1,7 @@ vendor.google.wireless_charger - 1 + 2 IWirelessCharger default From 0f7b441e1837a3ba74048d0bf5b7c71136011c83 Mon Sep 17 00:00:00 2001 From: Thales Lima Date: Wed, 15 Nov 2023 11:22:56 +0000 Subject: [PATCH 11/15] Revert "WLC: update AIDL manifest version to 2" Revert submission 25370033-wlc_aidl_v2 Reason for revert: /b/311146944 Reverted changes: /q/submissionid:25370033-wlc_aidl_v2 Change-Id: I7da8286a1327a74be942867c4f7db7e2fc3e0f87 --- wireless_charger/compatibility_matrix.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireless_charger/compatibility_matrix.xml b/wireless_charger/compatibility_matrix.xml index 370d8fb..d0adcde 100644 --- a/wireless_charger/compatibility_matrix.xml +++ b/wireless_charger/compatibility_matrix.xml @@ -1,7 +1,7 @@ vendor.google.wireless_charger - 2 + 1 IWirelessCharger default From 8f1f820f681f9f7de8e3cc8f7dc65e2664edfe72 Mon Sep 17 00:00:00 2001 From: YiKai Peng Date: Tue, 14 Nov 2023 09:48:51 +0000 Subject: [PATCH 12/15] WLC: update AIDL manifest version to 1-2 Bug: 310109332 Test: Build/Flash Change-Id: I8f3ca2f8f3ba979c466dc98fd772164767ef75df Signed-off-by: YiKai Peng --- wireless_charger/compatibility_matrix.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireless_charger/compatibility_matrix.xml b/wireless_charger/compatibility_matrix.xml index d0adcde..e0e575b 100644 --- a/wireless_charger/compatibility_matrix.xml +++ b/wireless_charger/compatibility_matrix.xml @@ -1,7 +1,7 @@ vendor.google.wireless_charger - 1 + 1-2 IWirelessCharger default From a9544cd2ed2100127cf0f3b7c0e1127ec07bf715 Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Fri, 17 Nov 2023 13:36:44 +0800 Subject: [PATCH 13/15] Remove unused Android.mk under device/google/redfin Bug: 311544087 Test: NA Change-Id: Idb858726b083d2f91ce17f4627aadff89a942b8c --- self-extractors/Android.mk | 0 .../google_devices/staging/{Android.mk => Android.mk.template} | 0 self-extractors/qcom/staging/{Android.mk => Android.mk.template} | 0 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 self-extractors/Android.mk rename self-extractors/google_devices/staging/{Android.mk => Android.mk.template} (100%) rename self-extractors/qcom/staging/{Android.mk => Android.mk.template} (100%) diff --git a/self-extractors/Android.mk b/self-extractors/Android.mk deleted file mode 100644 index e69de29..0000000 diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk.template similarity index 100% rename from self-extractors/google_devices/staging/Android.mk rename to self-extractors/google_devices/staging/Android.mk.template diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk.template similarity index 100% rename from self-extractors/qcom/staging/Android.mk rename to self-extractors/qcom/staging/Android.mk.template From 0bb31c7af7919e0103df385fce664e04d36952a2 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 14/15] Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex" 3c2aa5f3a2d0f3c5642dc96c2edde201f84e8e7a Bug: 303286040 Test: Compiles Change-Id: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0 --- device-redfin.mk | 3 ++ redfin/rro_overlays/NfcOverlay/Android.bp | 9 +++++ .../NfcOverlay/AndroidManifest.xml | 27 +++++++++++++ redfin/rro_overlays/NfcOverlay/OWNERS | 2 + .../NfcOverlay/res/values/config.xml | 38 +++++++++++++++++++ 5 files changed, 79 insertions(+) create mode 100644 redfin/rro_overlays/NfcOverlay/Android.bp create mode 100644 redfin/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 redfin/rro_overlays/NfcOverlay/OWNERS create mode 100644 redfin/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/device-redfin.mk b/device-redfin.mk index 6bd769c..ae4645e 100644 --- a/device-redfin.mk +++ b/device-redfin.mk @@ -247,3 +247,6 @@ endif # Workaround for prebuilt Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat + +PRODUCT_PACKAGES += \ + NfcOverlayRedfin diff --git a/redfin/rro_overlays/NfcOverlay/Android.bp b/redfin/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..c08c3e3 --- /dev/null +++ b/redfin/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_redfin_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayRedfin", + sdk_version: "current", + product_specific: true +} diff --git a/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml b/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/redfin/rro_overlays/NfcOverlay/OWNERS b/redfin/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/redfin/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/redfin/rro_overlays/NfcOverlay/res/values/config.xml b/redfin/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..3d2adaa --- /dev/null +++ b/redfin/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,38 @@ + + + + true + false + 10 + 2000 + https://support.google.com/pixelphone?p=nfc_tag_notification + + GD1YQ + GTT9Q + G5NZ6 + + true + + 70 + 140 + false + + 39 + + + 74 + + From 0f0ee71877294a8e069eea96c7d06b66e2febe78 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 6 Dec 2023 21:32:29 +0000 Subject: [PATCH 15/15] Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex" 3c2aa5f3a2d0f3c5642dc96c2edde201f84e8e7a Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0bb31c7af7919e0103df385fce664e04d36952a2) Merged-In: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0 Change-Id: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0 --- device-redfin.mk | 3 ++ redfin/rro_overlays/NfcOverlay/Android.bp | 9 +++++ .../NfcOverlay/AndroidManifest.xml | 27 +++++++++++++ redfin/rro_overlays/NfcOverlay/OWNERS | 2 + .../NfcOverlay/res/values/config.xml | 38 +++++++++++++++++++ 5 files changed, 79 insertions(+) create mode 100644 redfin/rro_overlays/NfcOverlay/Android.bp create mode 100644 redfin/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 redfin/rro_overlays/NfcOverlay/OWNERS create mode 100644 redfin/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/device-redfin.mk b/device-redfin.mk index 6bd769c..ae4645e 100644 --- a/device-redfin.mk +++ b/device-redfin.mk @@ -247,3 +247,6 @@ endif # Workaround for prebuilt Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat + +PRODUCT_PACKAGES += \ + NfcOverlayRedfin diff --git a/redfin/rro_overlays/NfcOverlay/Android.bp b/redfin/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..c08c3e3 --- /dev/null +++ b/redfin/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_redfin_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayRedfin", + sdk_version: "current", + product_specific: true +} diff --git a/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml b/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/redfin/rro_overlays/NfcOverlay/OWNERS b/redfin/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/redfin/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/redfin/rro_overlays/NfcOverlay/res/values/config.xml b/redfin/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..3d2adaa --- /dev/null +++ b/redfin/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,38 @@ + + + + true + false + 10 + 2000 + https://support.google.com/pixelphone?p=nfc_tag_notification + + GD1YQ + GTT9Q + G5NZ6 + + true + + 70 + 140 + false + + 39 + + + 74 + +