Merge "Update fix_permissions to not clobber the UID and GID variables. This causes issues in bash." into froyo
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 571e250..684de27 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -702,6 +702,7 @@
<apn carrier="Siminn MMS" mcc="274" mnc="01" apn="mms.simi.is" user="" server="" password="" mmsc="http://mms.simi.is/servlets/mms" mmsproxy="213.167.138.200" mmsport="9201" type="mms"/>
<apn carrier="Si.mobil Internet" mcc="293" mnc="40" apn="internet.simobil.si" user="simobil" server="" password="internet" mmsproxy="" mmsport="" mmsc="" proxy="80.95.224.46" port="9201" type="default,supl" />
<apn carrier="Si.mobil MMS" mcc="293" mnc="40" apn="mms.simobil.si" user="simobil" server="" password="internet" mmsproxy="80.95.224.46" mmsport="9201" mmsc="mmc" proxy="" port="" type="mms" />
+ <apn carrier="Simple" mcc="310" mnc="260" apn="simple" proxy="216.155.165.050" port="8080" user="" password="" server="" mmsc="http://smpl.mms.msg.eng.t-mobile.com/mms/wapenc" mmsproxy="216.155.165.050" mmsport="8080" type=""/>
<apn carrier="Simyo DE" apn="internet.eplus.de" type="" user="simyo" pass="simyo"/>
<apn carrier="Simyo ES" apn="gprs-service.com" mcc="214" mnc="19" type="default,supl"/>
<apn carrier="Simyo ES-MMS" apn="gprs-service.com" password="1234" mmsc="http://mms-services.eu" mmsproxy="217.12.32.180" mmsport="8080" mcc="214" mnc="19" type="mms"/>
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index d95f4d5..674c992 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -47,7 +47,8 @@
endif
# Use the audio profile hack
-PRODUCT_SPECIFIC_DEFINES += WITH_DS_HTCACOUSTIC_HACK=true
+WITH_DS_HTCACOUSTIC_HACK := true
+PRODUCT_SPECIFIC_DEFINES += WITH_DS_HTCACOUSTIC_HACK
#
# Copy DS specific prebuilt files
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index 1d1f7f4..b5b6e42 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -20,6 +20,11 @@
PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-liberty.map
#
+# Move dalvik cache to data partition where there is more room to solve startup problems
+#
+PRODUCT_PROPERTY_OVERRIDES += dalvik.vm.dexopt-data-only=1
+
+#
# Set ro.modversion
#