Revert "kitakami: Disable UIM, broken in OREO"

This reverts commit 24d583c4.

BoardConfigCommon.mk

@@ -126,7 +126,7 @@ TARGET_EXFAT_DRIVER := sdfat
 TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs
 
 # FM radio
-BOARD_HAVE_BCM_FM := false #UIM not compatible with Oreo, yet;
+BOARD_HAVE_BCM_FM := true
 
 # Partitions types
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

bluetooth/bt_vendor.conf

@@ -3,10 +3,8 @@
 #######################################################################################
 
 # UART device port where Bluetooth controller is attached (default ttyS1)
-UartPort = /dev/ttyHS0
-
-#UartPort = /dev/brcm_bt_drv
-#UimUartPort = /dev/ttyHS0
+UartPort = /dev/brcm_bt_drv
+UimUartPort = /dev/ttyHS0
 
 # Target Baudrate to change to if different from 3000000
 # This entry is mandatory if using V4L2

device-common.mk

@@ -152,6 +152,12 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/flashled_calc_parameters.cfg:system/etc/flashled_calc_parameters.cfg
 
+# FM
+PRODUCT_PACKAGES += \
+    FMRadio \
+    brcm-uim-sysfs \
+    libfmjni
+
 # Health
 PRODUCT_PACKAGES += \
     android.hardware.health@1.0-impl

lineage.dependencies

@@ -11,6 +11,10 @@
     "repository": "android_hardware_sony_timekeep",
     "target_path": "hardware/sony/timekeep"
   },
+  {
+    "repository": "android_hardware_broadcom_fm",
+    "target_path": "hardware/broadcom/fm"
+  },
   {
     "repository": "android_kernel_sony_msm8994",
     "target_path": "kernel/sony/msm8994"