Replace hardware features conf file to be emulator specific

full_base_telephoney.mk file gets used only for emulators which should
have bluetooth disabled. Using the default handheld_core_hardware.xml
file has bluetooth enabled. We should use the generic
handheld_core_hardware.xml file for emulators which has bluetooth
disabled.

Its presence causes problems upstream in SystemServer when
BluetoothService starts and requires an extra emulator config change
which should not be there.

Bug: 35361545
Test: Verified by launching Android Emulator. It works fine and does not
start bluetooth.

Change-Id: I484c3d5867f46853fb49f28422dd72ab362ed768

diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk
index 9a2c63a..3d195a1 100644 (file)
--- a/target/product/full_base_telephony.mk
+++ b/target/product/full_base_telephony.mk
@@ -25,7 +25,7 @@ PRODUCT_PROPERTY_OVERRIDES := \
 
 PRODUCT_COPY_FILES := \
     device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
-    frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
+    device/generic/goldfish/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)