From 083fc458f82b8817dc11933c091e4ab08feff603 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Sat, 4 Aug 2012 00:19:07 +0100 Subject: [PATCH] cm: Add default configurations for BT Since they're now split for phone/tablet, there isn't any default and devices without an explicit config will register as generics. Use sane defaults for both device types, device-specific configs can still override these in their makefiles if necessary Change-Id: Ie20a05d07a047f409bafb20f02d0c673ec2dc250 --- config/common_full_phone.mk | 5 +++++ config/common_full_tablet_wifionly.mk | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk index 8d69ead5..5ee0f7d7 100644 --- a/config/common_full_phone.mk +++ b/config/common_full_phone.mk @@ -22,6 +22,11 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PACKAGES += \ Mms +# BT config +PRODUCT_COPY_FILES += \ + system/bluetooth/data/main.conf:system/etc/bluetooth/main.conf + + ifeq ($(TARGET_BOOTANIMATION_NAME),) PRODUCT_COPY_FILES += \ vendor/cm/prebuilt/common/bootanimation/vertical-480x800.zip:system/media/bootanimation.zip diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk index 410bc924..963dfd73 100644 --- a/config/common_full_tablet_wifionly.mk +++ b/config/common_full_tablet_wifionly.mk @@ -19,6 +19,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.config.notification_sound=CyanMessage.ogg \ ro.config.alarm_alert=CyanAlarm.ogg +# BT config +PRODUCT_COPY_FILES += \ + system/bluetooth/data/main.nonsmartphone.conf:system/etc/bluetooth/main.conf + ifeq ($(TARGET_BOOTANIMATION_NAME),) PRODUCT_COPY_FILES += \ vendor/cm/prebuilt/common/bootanimation/horizontal-1280x800.zip:system/media/bootanimation.zip