From d0acdf54777b93abee34f8f8c3b24f351852b93d Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Fri, 18 Mar 2022 11:43:28 -0700 Subject: [PATCH 01/15] Remove now-unnecessary merge configs. The values in these files can now be inferred, starting in https://r.android.com/2006311. In fact, since http://cl/435084270 they have been inferred for these redfin VF targets. Bug: 221858722 Test: n/a, files unused Change-Id: I6851bed2ece4c932133228afd47117a47483d7ad --- vf/framework_item_list.txt | 23 ----------------------- vf/framework_misc_info_keys.txt | 26 -------------------------- vf/vendor_item_list.txt | 21 --------------------- 3 files changed, 70 deletions(-) delete mode 100644 vf/framework_item_list.txt delete mode 100644 vf/framework_misc_info_keys.txt delete mode 100644 vf/vendor_item_list.txt diff --git a/vf/framework_item_list.txt b/vf/framework_item_list.txt deleted file mode 100644 index 81bec4b..0000000 --- a/vf/framework_item_list.txt +++ /dev/null @@ -1,23 +0,0 @@ -IMAGES/product.img -IMAGES/product.map -IMAGES/system_ext.img -IMAGES/system_ext.map -IMAGES/system.img -IMAGES/system.map -IMAGES/system_other.img -IMAGES/userdata.img -IMAGES/vbmeta_system.img -META/apexkeys.txt -META/apkcerts.txt -META/filesystem_config.txt -META/postinstall_config.txt -META/product_filesystem_config.txt -META/root_filesystem_config.txt -META/system_ext_filesystem_config.txt -META/system_other_filesystem_config.txt -META/update_engine_config.txt -PRODUCT/* -ROOT/* -SYSTEM/* -SYSTEM_EXT/* -SYSTEM_OTHER/* diff --git a/vf/framework_misc_info_keys.txt b/vf/framework_misc_info_keys.txt deleted file mode 100644 index 0bcc385..0000000 --- a/vf/framework_misc_info_keys.txt +++ /dev/null @@ -1,26 +0,0 @@ -ab_update -avb_product_add_hashtree_footer_args -avb_product_hashtree_enable -avb_system_add_hashtree_footer_args -avb_system_ext_add_hashtree_footer_args -avb_system_ext_hashtree_enable -avb_system_hashtree_enable -avb_system_other_add_hashtree_footer_args -avb_system_other_hashtree_enable -avb_vbmeta_system -avb_vbmeta_system_algorithm -avb_vbmeta_system_args -avb_vbmeta_system_key_path -avb_vbmeta_system_rollback_index_location -building_product_image -building_system_ext_image -building_system_image -building_system_other_image -default_system_dev_certificate -product_disable_sparse -product_fs_type -root_dir -system_disable_sparse -system_ext_disable_sparse -system_ext_fs_type -system_other_disable_sparse diff --git a/vf/vendor_item_list.txt b/vf/vendor_item_list.txt deleted file mode 100644 index a86378c..0000000 --- a/vf/vendor_item_list.txt +++ /dev/null @@ -1,21 +0,0 @@ -BOOT/* -DATA/* -IMAGES/boot.img -IMAGES/dtbo.img -IMAGES/vendor_boot.img -IMAGES/vendor.img -IMAGES/vendor.map -META/boot_filesystem_config.txt -META/care_map.pb -META/kernel_configs.txt -META/kernel_version.txt -META/otakeys.txt -META/releasetools.py -META/vendor_boot_filesystem_config.txt -META/vendor_filesystem_config.txt -ODM/* -OTA/android-info.txt -PREBUILT_IMAGES/* -RADIO/* -VENDOR/* -VENDOR_BOOT/* From afaa44272e56ad392fa9f5b41cd430a8f76ac68e Mon Sep 17 00:00:00 2001 From: Stephane Lee Date: Thu, 12 May 2022 17:16:27 -0700 Subject: [PATCH 02/15] Add device-specific support for GoogleBattery AIDL V1 Bug: 232461104 Test: Ensure Adaptive Charging/Battery health flags works as expected Change-Id: Ia4ce4f7142804c56a43c0dc9869f4af39b984328 --- vf/device_framework_matrix_product.R.5.xml | 4 ++-- vf/device_framework_matrix_product.S.5.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vf/device_framework_matrix_product.R.5.xml b/vf/device_framework_matrix_product.R.5.xml index 2d7ba29..a00e40c 100644 --- a/vf/device_framework_matrix_product.R.5.xml +++ b/vf/device_framework_matrix_product.R.5.xml @@ -90,9 +90,9 @@ default - + vendor.google.google_battery - 1.1-2 + 1 IGoogleBattery default diff --git a/vf/device_framework_matrix_product.S.5.xml b/vf/device_framework_matrix_product.S.5.xml index ca45b30..04114ed 100644 --- a/vf/device_framework_matrix_product.S.5.xml +++ b/vf/device_framework_matrix_product.S.5.xml @@ -90,9 +90,9 @@ default - + vendor.google.google_battery - 1.1-2 + 1 IGoogleBattery default From 167f2fe910536ce30cb10687f12da9c0403e6d30 Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Mon, 23 May 2022 13:25:45 -0700 Subject: [PATCH 03/15] Creates the FCM for redfin_vf_t (U system + T vendor). Bug: 233646904 Test: lunch redfin_vf_t; m Change-Id: I857e6404d35a8922ead1ff619d797a615b9113b9 --- vf/Android.bp | 9 + vf/device_framework_matrix_product.T.7.xml | 345 +++++++++++++++++++++ 2 files changed, 354 insertions(+) create mode 100644 vf/device_framework_matrix_product.T.7.xml diff --git a/vf/Android.bp b/vf/Android.bp index c8b5215..fc3e482 100644 --- a/vf/Android.bp +++ b/vf/Android.bp @@ -19,3 +19,12 @@ vintf_compatibility_matrix { "device_framework_matrix_product.S.5.xml", ], } + +vintf_compatibility_matrix { + name: "redfin_product_compatibility_matrix.T.7.xml", + stem: "compatibility_matrix.redfin.T.7.xml", + product_specific: true, + srcs: [ + "device_framework_matrix_product.T.7.xml", + ], +} diff --git a/vf/device_framework_matrix_product.T.7.xml b/vf/device_framework_matrix_product.T.7.xml new file mode 100644 index 0000000..0da5010 --- /dev/null +++ b/vf/device_framework_matrix_product.T.7.xml @@ -0,0 +1,345 @@ + + + com.qualcomm.qti.imscmservice + 2.2 + + IImsCmService + qti.ims.connectionmanagerservice + + + + com.qualcomm.qti.uceservice + 2.3 + + IUceService + com.qualcomm.qti.uceservice + + + + vendor.qti.ims.factory + 1.0 + + IImsFactory + default + + + + vendor.qti.data.factory + 2.2 + + IFactory + default + + + + + vendor.qti.hardware.data.iwlan + 1.0 + + IIWlan + slot1 + 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 + + IDisplayColor + default + + + + vendor.display.config + 2.0 + + IDisplayConfig + default + + + + vendor.display.postproc + 1.0 + + IDisplayPostproc + default + + + + vendor.google.google_battery + 1.2 + + IGoogleBattery + default + + + + vendor.google.radioext + 1.2-3 + + IRadioExt + default + + + + vendor.qti.hardware.radio.am + 1.0 + + IQcRilAudio + slot1 + slot2 + + + + vendor.qti.hardware.radio.ims + 1.6 + + IImsRadio + imsradio0 + imsradio1 + + + + vendor.qti.hardware.radio.lpa + 1.0 + + IUimLpa + UimLpa0 + UimLpa1 + + + + vendor.qti.hardware.radio.qcrilhook + 1.0 + + IQtiOemHook + oemhook0 + oemhook1 + + + + vendor.qti.hardware.radio.uim + 1.2 + + IUim + Uim0 + Uim1 + + + + vendor.qti.hardware.radio.uim_remote_client + 1.0 + + IUimRemoteServiceClient + uimRemoteClient0 + uimRemoteClient1 + + + + vendor.qti.hardware.radio.uim_remote_server + 1.0 + + IUimRemoteServiceServer + uimRemoteServer0 + uimRemoteServer1 + + + + vendor.qti.hardware.tui_comm + 1.0 + + ITuiComm + default + + + + vendor.qti.hardware.display.allocator + 1.0 + 3.0 + 4.0 + + IQtiAllocator + default + + + + vendor.qti.hardware.display.mapper + 2.0 + 3.0 + 4.0 + + IQtiMapper + default + + + + vendor.qti.hardware.display.composer + 3.0 + + IQtiComposer + default + + + + vendor.qti.hardware.radio.internal.deviceinfo + 1.0 + + IDeviceInfo + deviceinfo + + + + vendor.qti.imsrtpservice + 3.0 + + IRTPService + imsrtpservice + + + + vendor.qti.ims.callinfo + 1.0 + + IService + default + + + + hardware.google.bluetooth.sar + 1.0 + + IBluetoothSar + default + + + + hardware.google.bluetooth.bt_channel_avoidance + 1.0 + + IBTChannelAvoidance + default + + + + vendor.google.wifi_ext + 1.3 + + IWifiExt + default + + + + vendor.qti.hardware.cacert + 1.0 + + IService + default + + + + vendor.qti.hardware.data.connection + 1.1 + + IDataConnection + slot1 + slot2 + + + + vendor.qti.hardware.radio.qtiradio + 1.0 + + IQtiRadio + slot1 + slot2 + + + + vendor.qti.hardware.radio.qtiradio + 2.4 + + IQtiRadio + slot1 + slot2 + + + + + vendor.qti.hardware.qseecom + 1.0 + + IQSEECom + default + + + + + vendor.qti.qspmhal + 1.0 + + IQspmhal + default + + + + vendor.qti.hardware.qteeconnector + 1.0 + + IAppConnector + default + + + IGPAppConnector + default + + + + com.google.hardware.pixel.display + + IDisplay + default + + + + + vendor.qti.hardware.dsp + 1.0 + + IDspService + dspservice + + + + vendor.google.wireless_charger + 1.3 + + IWirelessCharger + default + + + From 9a9626d72b52ab6bf171c3dfb3583023617c242f Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Mon, 13 Jun 2022 22:17:56 +0000 Subject: [PATCH 04/15] Allow including car boards from outside google_car Bug: 224902566 Test: Build redfin_car Change-Id: I0577f0a11fea2773195416e63db1be6e0430ecc9 --- redfin/BoardConfig.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/redfin/BoardConfig.mk b/redfin/BoardConfig.mk index 8e371df..1bcb070 100644 --- a/redfin/BoardConfig.mk +++ b/redfin/BoardConfig.mk @@ -14,8 +14,11 @@ # limitations under the License. # -ifdef PHONE_CAR_BOARD_PRODUCT - include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk +ifdef AUTOMOTIVE_PRODUCT_PATH + #RBC# include_top device/google/auto_tcu + #RBC# include_top device/google/pixel_tcu + #RBC# include_top device/google_car + include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk else TARGET_BOOTLOADER_BOARD_NAME := redfin TARGET_SCREEN_DENSITY := 440 From 7a1521a0c0f9bf11df37065bbfeea897a0b16393 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Fri, 29 Apr 2022 13:44:00 -0700 Subject: [PATCH 05/15] Dumpstate: get fsck log Bug: 241641121 Signed-off-by: Jaegeuk Kim Change-Id: Iaadb166fe9194518b2db75080cddc02526bdf2bb --- dumpstate/DumpstateDevice.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 85f8ed0..2b529c4 100755 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -516,6 +516,7 @@ static void DumpSensorLog(int fd) { static void DumpF2FS(int fd) { DumpFileToFd(fd, "F2FS", "/sys/kernel/debug/f2fs/status"); + DumpFileToFd(fd, "F2FS", "/dev/fscklogs/fsck"); RunCommandToFd(fd, "F2FS - fsck time (ms)", {"/vendor/bin/sh", "-c", "getprop ro.boottime.init.fsck.data"}); RunCommandToFd(fd, "F2FS - checkpoint=disable time (ms)", {"/vendor/bin/sh", "-c", "getprop ro.boottime.init.mount.data"}); } From fa8c3bb8f32ecca7645c8b96f81d0bc183c72eca Mon Sep 17 00:00:00 2001 From: Ray Chi Date: Mon, 21 Feb 2022 14:22:42 +0800 Subject: [PATCH 06/15] recovery: add wait for dwc3 device to probe If fastbootd starts before the dwc3 device probes, fastbootd would be failed to enable USB gadget. This patch adds a dependency on the dwc3 device probing before setting the sys.usb.controller property. Bug: 220393297 Test: build pass, fastboot works Change-Id: I4e5b34354f19547f55acc53ccff0b54adce2d982 Signed-off-by: Jimmy Hu --- init.recovery.device.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/init.recovery.device.rc b/init.recovery.device.rc index 7df16ec..596e813 100644 --- a/init.recovery.device.rc +++ b/init.recovery.device.rc @@ -3,6 +3,7 @@ on fs symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice on init + wait /sys/devices/platform/soc/a600000.ssusb/a600000.dwc3/driver 10 setprop sys.usb.configfs 1 # Don't lose recovery logs- keep warm reset for coming out of recovery. write /sys/module/msm_poweroff/parameters/warm_reset 1 From 36ddc25834bfa33bd63142e2d29b92b224ffac9c Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Wed, 14 Sep 2022 11:54:49 +0800 Subject: [PATCH 07/15] Add display shape config for redfin Bug: 236935288 Test: make Change-Id: I91931152332699d1c3b1db0af8bdc6ada404c6e7 --- .../frameworks/base/core/res/res/values/config.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/redfin/overlay/frameworks/base/core/res/res/values/config.xml b/redfin/overlay/frameworks/base/core/res/res/values/config.xml index 2eb7f2c..56b2b1c 100755 --- a/redfin/overlay/frameworks/base/core/res/res/values/config.xml +++ b/redfin/overlay/frameworks/base/core/res/res/values/config.xml @@ -278,4 +278,17 @@ 64 + + + M 0 0 L 0 2340 L 1080 2340 L 1080 0 L 1079.9258 0 L 1079.9961 216 C 1079.9961 187.36006 1080.1276 148.13971 1078.7676 119.50977 C 1078.3576 110.89977 1077.7959 102.31975 1076.8359 93.759766 C 1076.0059 86.30978 1074.8876 78.950375 1073.0977 71.650391 C 1071.3377 64.490405 1068.9864 57.68983 1065.6465 51.089844 C 1061.6565 43.189863 1056.5277 36.09983 1050.2578 29.839844 C 1043.9979 23.579856 1036.9077 18.460695 1029.0078 14.470703 C 1022.3979 11.140709 1015.5974 8.789059 1008.4375 7.0390625 C 1001.1376 5.2490661 993.77823 4.1307796 986.31836 3.3007812 C 977.74852 2.3407832 969.16846 1.7791398 960.55859 1.3691406 C 931.8991 0.00914337 892.65949 0.15039062 864 0.15039062 L 1079.9258 0 L 0.07421875 0 L 216 0.15039062 C 187.34051 0.15039063 148.1009 0.00914337 119.44141 1.3691406 C 110.83154 1.7791398 102.25149 2.3407832 93.681641 3.3007812 C 86.22177 4.1307796 78.862373 5.2490661 71.5625 7.0390625 C 64.402625 8.7890591 57.602072 11.140709 50.992188 14.470703 C 43.092325 18.460695 36.002077 23.579856 29.742188 29.839844 C 23.472297 36.09983 18.343447 43.18986 14.353516 51.089844 C 11.013574 57.68983 8.6623129 64.490405 6.9023438 71.650391 C 5.1123749 78.950375 3.994048 86.30978 3.1640625 93.759766 C 2.2040793 102.31975 1.6424147 110.89977 1.2324219 119.50977 C -0.12755439 148.13971 0.00390625 187.36006 0.00390625 216 L 0.07421875 0 L 0 0 z M 0.00390625 2103 C 0.00390625 2132.1097 -0.10716124 2185.6894 0.96484375 2214.7891 C 1.3355369 2224.8589 1.8673045 2234.8788 3.0996094 2244.8887 C 4.1615956 2253.4486 5.7431471 2261.7689 8.4882812 2269.9688 C 11.253453 2278.2185 14.961912 2285.7476 19.871094 2292.9375 C 25.551717 2301.2774 32.563821 2308.6366 40.628906 2314.7266 C 56.218063 2326.5064 73.40016 2331.8675 92.195312 2334.8574 C 100.87153 2336.2374 109.5681 2337.0773 118.31445 2337.6973 C 128.20295 2338.3973 138.10124 2338.8074 148.00977 2339.1074 C 180.89126 2340.0974 227.1185 2339.998 260 2339.998 L 0.00390625 2339.998 L 0.00390625 2103 z M 1079.9961 2103 L 1079.9961 2339.998 L 820 2339.998 C 852.8815 2339.998 899.10874 2340.0974 931.99023 2339.1074 C 941.89876 2338.8074 951.79705 2338.3973 961.68555 2337.6973 C 970.4319 2337.0773 979.12847 2336.2374 987.80469 2334.8574 C 1006.5999 2331.8675 1023.7819 2326.5064 1039.3711 2314.7266 C 1047.4362 2308.6366 1054.4483 2301.2774 1060.1289 2292.9375 C 1065.0381 2285.7476 1068.7465 2278.2185 1071.5117 2269.9688 C 1074.2569 2261.7689 1075.8384 2253.4486 1076.9004 2244.8887 C 1078.1327 2234.8788 1078.6645 2224.8589 1079.0352 2214.7891 C 1080.1072 2185.6894 1079.9961 2132.1097 1079.9961 2103 z From 5f06ae8d25105e897f4cc0609c09645c65b43e49 Mon Sep 17 00:00:00 2001 From: Gabriel Biren Date: Fri, 28 Oct 2022 18:52:47 +0000 Subject: [PATCH 08/15] Update Redfin compatibility matrix to use the AIDL wifi_ext service. Bug: 205044134 Test: Presubmit tests Change-Id: I263e094cda4ccd78f07d3082e26caf8a7ef93d63 --- vf/device_framework_matrix_product.R.5.xml | 4 ++-- vf/device_framework_matrix_product.S.5.xml | 4 ++-- vf/device_framework_matrix_product.T.7.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vf/device_framework_matrix_product.R.5.xml b/vf/device_framework_matrix_product.R.5.xml index a00e40c..ed9a2dc 100644 --- a/vf/device_framework_matrix_product.R.5.xml +++ b/vf/device_framework_matrix_product.R.5.xml @@ -229,9 +229,9 @@ default - + vendor.google.wifi_ext - 1.1 + 1 IWifiExt default diff --git a/vf/device_framework_matrix_product.S.5.xml b/vf/device_framework_matrix_product.S.5.xml index 04114ed..4db1f3f 100644 --- a/vf/device_framework_matrix_product.S.5.xml +++ b/vf/device_framework_matrix_product.S.5.xml @@ -245,9 +245,9 @@ default - + vendor.google.wifi_ext - 1.2 + 1 IWifiExt default diff --git a/vf/device_framework_matrix_product.T.7.xml b/vf/device_framework_matrix_product.T.7.xml index 0da5010..d2fd066 100644 --- a/vf/device_framework_matrix_product.T.7.xml +++ b/vf/device_framework_matrix_product.T.7.xml @@ -245,9 +245,9 @@ default - + vendor.google.wifi_ext - 1.3 + 1 IWifiExt default From e97e3490734a262ff2d1d645d47d9ea6f03994f2 Mon Sep 17 00:00:00 2001 From: Gabriel Biren Date: Thu, 1 Dec 2022 22:27:42 +0000 Subject: [PATCH 09/15] Revert "Update Redfin compatibility matrix to use the" This reverts commit 5f06ae8d25105e897f4cc0609c09645c65b43e49. Reason for revert: Blocking Wembley team Change-Id: I25338eded93b9009090a5b9b22c09af52c934f57 --- vf/device_framework_matrix_product.R.5.xml | 4 ++-- vf/device_framework_matrix_product.S.5.xml | 4 ++-- vf/device_framework_matrix_product.T.7.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vf/device_framework_matrix_product.R.5.xml b/vf/device_framework_matrix_product.R.5.xml index ed9a2dc..a00e40c 100644 --- a/vf/device_framework_matrix_product.R.5.xml +++ b/vf/device_framework_matrix_product.R.5.xml @@ -229,9 +229,9 @@ default - + vendor.google.wifi_ext - 1 + 1.1 IWifiExt default diff --git a/vf/device_framework_matrix_product.S.5.xml b/vf/device_framework_matrix_product.S.5.xml index 4db1f3f..04114ed 100644 --- a/vf/device_framework_matrix_product.S.5.xml +++ b/vf/device_framework_matrix_product.S.5.xml @@ -245,9 +245,9 @@ default - + vendor.google.wifi_ext - 1 + 1.2 IWifiExt default diff --git a/vf/device_framework_matrix_product.T.7.xml b/vf/device_framework_matrix_product.T.7.xml index d2fd066..0da5010 100644 --- a/vf/device_framework_matrix_product.T.7.xml +++ b/vf/device_framework_matrix_product.T.7.xml @@ -245,9 +245,9 @@ default - + vendor.google.wifi_ext - 1 + 1.3 IWifiExt default From c0131d99d5b1c5c2dbbf35c9ba3821b5c62dad51 Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Wed, 7 Dec 2022 05:19:22 +0000 Subject: [PATCH 10/15] WLC: Include the wireless_charger from gs-common Bug: 237600973 Change-Id: I63fe189c6e41b916f496845d9ea9bab87ca703e7 Signed-off-by: Ken Yang --- device-redfin.mk | 2 ++ device_framework_matrix_product.xml | 9 +-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/device-redfin.mk b/device-redfin.mk index a1b9608..5e4a397 100644 --- a/device-redfin.mk +++ b/device-redfin.mk @@ -246,3 +246,5 @@ endif # Workaround for prebuilt Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat + +include device/google/gs-common/wireless_charger/wireless_charger.mk diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index f3fcd07..89b8e87 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -1,10 +1,3 @@ - - vendor.google.wireless_charger - 1.3 - - IWirelessCharger - default - - + From b75d5d499299d392cc6c2f6107d7e1d7b4d7162a Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Fri, 6 Jan 2023 10:51:34 +0000 Subject: [PATCH 11/15] WLC: Add device specific wireless_charger files Cleanup the sysfs_wlc and add the latest wireless_charger HAL as device specificed implementation to keep the compatibility Bug: 264624634 Bug: 263830018 Change-Id: I0b4a0c3f57ce85ebc700e46deadc938ad74602b4 Signed-off-by: Ken Yang --- device-redfin.mk | 2 -- wireless_charger/compatibility_matrix.xml | 10 ++++++++++ wireless_charger/wireless_charger.mk | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 wireless_charger/compatibility_matrix.xml create mode 100644 wireless_charger/wireless_charger.mk diff --git a/device-redfin.mk b/device-redfin.mk index 5e4a397..a1b9608 100644 --- a/device-redfin.mk +++ b/device-redfin.mk @@ -246,5 +246,3 @@ endif # Workaround for prebuilt Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat - -include device/google/gs-common/wireless_charger/wireless_charger.mk diff --git a/wireless_charger/compatibility_matrix.xml b/wireless_charger/compatibility_matrix.xml new file mode 100644 index 0000000..d0adcde --- /dev/null +++ b/wireless_charger/compatibility_matrix.xml @@ -0,0 +1,10 @@ + + + vendor.google.wireless_charger + 1 + + IWirelessCharger + default + + + diff --git a/wireless_charger/wireless_charger.mk b/wireless_charger/wireless_charger.mk new file mode 100644 index 0000000..67b72d0 --- /dev/null +++ b/wireless_charger/wireless_charger.mk @@ -0,0 +1,6 @@ +# This wireless_charger folder is used to keep the compatibility for later google devices +PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces +PRODUCT_PACKAGES += vendor.google.wireless_charger-default +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/redfin/wireless_charger/compatibility_matrix.xml + +BOARD_VENDOR_SEPOLICY_DIRS += device/google/redfin-sepolicy/wireless_charger From 91aefea8531870f748c8b6b827ee14369dc20c0f Mon Sep 17 00:00:00 2001 From: George Date: Wed, 1 Feb 2023 17:50:31 +0800 Subject: [PATCH 12/15] [NFC] Set tag_intent_app_pref_supported Bug: 244272155 Test: atest android.permission.cts.NfcPermissionTest Test: atest NfcFeatureFlagTest Change-Id: Icaa8caacc4a351016b75eb09dd0926e2e385dd60 --- redfin/overlay/packages/apps/Nfc/res/values/config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/redfin/overlay/packages/apps/Nfc/res/values/config.xml b/redfin/overlay/packages/apps/Nfc/res/values/config.xml index 6bf40a0..126e096 100644 --- a/redfin/overlay/packages/apps/Nfc/res/values/config.xml +++ b/redfin/overlay/packages/apps/Nfc/res/values/config.xml @@ -24,4 +24,5 @@ GTT9Q G5NZ6 + true From eaad44d7dc296d47bf55f159d55ed02b2c1b094a Mon Sep 17 00:00:00 2001 From: George Chang Date: Thu, 9 Mar 2023 06:16:01 +0000 Subject: [PATCH 13/15] [NFC] Add antenna position coordinates Bug: 272406680 Test: manual Change-Id: Ic1b0573d51cf56bfd10147efc2b9713aec258116 --- redfin/overlay/packages/apps/Nfc/res/values/config.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/redfin/overlay/packages/apps/Nfc/res/values/config.xml b/redfin/overlay/packages/apps/Nfc/res/values/config.xml index 126e096..3d2adaa 100644 --- a/redfin/overlay/packages/apps/Nfc/res/values/config.xml +++ b/redfin/overlay/packages/apps/Nfc/res/values/config.xml @@ -25,4 +25,14 @@ G5NZ6 true + + 70 + 140 + false + + 39 + + + 74 + From 1ccaf8e861b17885c1c63f61ffa26478fb691a26 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Tue, 21 Feb 2023 09:40:13 +0800 Subject: [PATCH 14/15] thermal: Update config for stats Bug: 259903201 Test: local build and verify stats Change-Id: I6fd1d674ef8d93495f6142055b547d652bbc8b6e --- thermal_info_config_redfin.json | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/thermal_info_config_redfin.json b/thermal_info_config_redfin.json index d828587..7b581b2 100644 --- a/thermal_info_config_redfin.json +++ b/thermal_info_config_redfin.json @@ -342,5 +342,20 @@ "Name":"fcc", "Type":"BATTERY" } - ] + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["skin-therm-monitor"], + "RecordWithThreshold": [ + { + "Name": "skin-therm-monitor", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "usbc-virt-monitor", + "Thresholds": [10, 15] + } + ] + } + } } From e86bdd7e9703c48b0ffcc6dd909f7e55739c2183 Mon Sep 17 00:00:00 2001 From: Richard Chang Date: Mon, 15 May 2023 02:59:54 +0000 Subject: [PATCH 15/15] redfin: remove customizedMaxCachedProcesses With project Snowbird in U, the MaxCachedProcesses is 1024 by default Bug: 278086134 Test: Build Change-Id: I02432c6eb101da03bf2ea496c61d297e5a122769 --- redfin/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/redfin/overlay/frameworks/base/core/res/res/values/config.xml b/redfin/overlay/frameworks/base/core/res/res/values/config.xml index 56b2b1c..ea4904f 100755 --- a/redfin/overlay/frameworks/base/core/res/res/values/config.xml +++ b/redfin/overlay/frameworks/base/core/res/res/values/config.xml @@ -276,9 +276,6 @@ 0:2:15 - - 64 -