summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hillenbrand <daniel.hillenbrand@codeworkx.de>2012-07-06 16:57:21 +0200
committerDaniel Hillenbrand <daniel.hillenbrand@codeworkx.de>2012-07-06 16:57:21 +0200
commit0deb4dc0d164d610ac5b7561f11b47b5c2b60194 (patch)
treec791f60367f6c937cd1b0f6334f57405b4ec5385
parentc05041bc0e6e7458d6a1c520d1d9a457535f18ac (diff)
parent138815b00f78f878205aa42126c04367c01e0873 (diff)
downloaddevice_samsung_p5100-0deb4dc0d164d610ac5b7561f11b47b5c2b60194.zip
device_samsung_p5100-0deb4dc0d164d610ac5b7561f11b47b5c2b60194.tar.gz
device_samsung_p5100-0deb4dc0d164d610ac5b7561f11b47b5c2b60194.tar.bz2
Merge branch 'ics' of github.com:teamhacksung/android_device_samsung_p5100 into ics
-rw-r--r--p5100.mk6
-rwxr-xr-xp51xx-common.mk3
2 files changed, 9 insertions, 0 deletions
diff --git a/p5100.mk b/p5100.mk
index 9669220..6c9bd4b 100644
--- a/p5100.mk
+++ b/p5100.mk
@@ -29,5 +29,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
ro.telephony.ril_class=Smdk4210RIL \
mobiledata.interfaces=pdp0,wlan0,gprs,ppp0
+# These are the hardware-specific features
+PRODUCT_COPY_FILES += \
+ frameworks/base/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
+ frameworks/base/data/etc/android.software.sip.xml:system/etc/permissions/android.software.sip.xml \
+ frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
+
# Use the non-open-source parts, if they're present
$(call inherit-product, vendor/samsung/p51xx/p5100-vendor.mk)
diff --git a/p51xx-common.mk b/p51xx-common.mk
index ad4a3f3..3713014 100755
--- a/p51xx-common.mk
+++ b/p51xx-common.mk
@@ -108,16 +108,19 @@ PRODUCT_PACKAGES += \
# These are the hardware-specific features
PRODUCT_COPY_FILES += \
frameworks/base/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \
+ frameworks/base/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
frameworks/base/data/etc/android.hardware.camera.xml:system/etc/permissions/android.hardware.camera.xml \
frameworks/base/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
frameworks/base/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \
frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
frameworks/base/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
+ frameworks/base/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \
frameworks/base/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
frameworks/base/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
frameworks/base/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
frameworks/base/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
+ frameworks/base/data/etc/android.hardware.touchscreen.xml:system/etc/permissions/android.hardware.touchscreen.xml \
frameworks/base/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
frameworks/base/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \