Revert "Revert "kitakami: Disable UIM, broken in OREO""

This reverts commit 9501d371.

Change-Id: Ie5a44020fea1a288d53addd4dea04063935239eb

BoardConfigCommon.mk

@@ -128,7 +128,7 @@ TARGET_EXFAT_DRIVER := sdfat
 TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs
 
 # FM radio
-BOARD_HAVE_BCM_FM := false
+BOARD_HAVE_BCM_FM := false #UIM not compatible with Oreo, yet;
 
 # BT/FM (Broadcom): Adjust the sysfs patch for 3.10 kernel
 BOARD_HAVE_BCM_FM_SYSFS := "/sys/bus/platform/drivers/bcm_ldisc/bcm_ldisc/"

bluetooth/bt_vendor.conf

@@ -3,6 +3,8 @@
 #######################################################################################
 
 # UART device port where Bluetooth controller is attached (default ttyS1)
+UartPort = /dev/ttyHS0
+
 #UartPort = /dev/brcm_bt_drv
 #UimUartPort = /dev/ttyHS0
 

device-common.mk

@@ -186,12 +186,6 @@ 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

@@ -7,10 +7,6 @@
     "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"