Replace hardware features conf file to be emulator specific
The mini_common.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.
It's 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: Iae4bb74db703b2b036464e62be99c7c3f2e84ec9
diff --git a/mini_common.mk b/mini_common.mk
index 5ee22be..41ca142 100644
--- a/mini_common.mk
+++ b/mini_common.mk
@@ -64,13 +64,13 @@
PRODUCT_PACKAGES += camera.goldfish.jpeg
PRODUCT_COPY_FILES += \
+ device/generic/goldfish/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \
frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
frameworks/native/data/etc/android.hardware.sensor.barometer.xml:system/etc/permissions/android.hardware.sensor.barometer.xml \
frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
- frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
PRODUCT_PROPERTY_OVERRIDES += \
ro.carrier=unknown \
