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 - - + 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"}); } 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 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 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..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,6 +276,16 @@ 0:2:15 - - 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 diff --git a/redfin/overlay/packages/apps/Nfc/res/values/config.xml b/redfin/overlay/packages/apps/Nfc/res/values/config.xml index 6bf40a0..3d2adaa 100644 --- a/redfin/overlay/packages/apps/Nfc/res/values/config.xml +++ b/redfin/overlay/packages/apps/Nfc/res/values/config.xml @@ -24,4 +24,15 @@ GTT9Q G5NZ6 + true + + 70 + 140 + false + + 39 + + + 74 + 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] + } + ] + } + } } 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 + + + 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