Merge "vendor: add Xperia T maintainers" into jellybean
diff --git a/config/common.mk b/config/common.mk
index 1f69feb..e80030a 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -85,9 +85,12 @@
PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit
+# CM-specific init file
+PRODUCT_COPY_FILES += \
+ vendor/cm/prebuilt/common/etc/init.local.rc:root/init.cm.rc
+
# Compcache/Zram support
PRODUCT_COPY_FILES += \
- vendor/cm/prebuilt/common/etc/init.local.rc:system/etc/init.local.rc \
vendor/cm/prebuilt/common/bin/compcache:system/bin/compcache \
vendor/cm/prebuilt/common/bin/handle_compcache:system/bin/handle_compcache
@@ -143,7 +146,8 @@
audio_effects.conf \
CMWallpapers \
Apollo \
- CMUpdater
+ CMUpdater \
+ CMFileManager
# Extra tools in CM
PRODUCT_PACKAGES += \
diff --git a/jenkins-build-targets b/jenkins-build-targets
index 7252732..deebb09 100644
--- a/jenkins-build-targets
+++ b/jenkins-build-targets
@@ -3,6 +3,7 @@
cm_crespo-userdebug
cm_crespo4g-userdebug
cm_d2att-userdebug
+cm_d2mtr-userdebug
cm_d2spr-userdebug
cm_d2tmo-userdebug
cm_d2usc-userdebug
@@ -12,8 +13,8 @@
cm_everest-userdebug
cm_evita-userdebug
cm_fascinatemtd-userdebug
-cm_galaxysmtd-userdebug
cm_galaxysbmtd-userdebug
+cm_galaxysmtd-userdebug
cm_grouper-userdebug
cm_hercules-userdebug
cm_i777-userdebug
@@ -21,18 +22,16 @@
cm_i9100g-userdebug
cm_i9300-userdebug
cm_jewel-userdebug
-cm_mint-userdebug
cm_maguro-userdebug
cm_mesmerizemtd-userdebug
+cm_mint-userdebug
cm_n7000-userdebug
cm_n8000-userdebug
cm_n8013-userdebug
-cm_quincyatt-userdebug
-cm_quincytmo-userdebug
-cm_p1-userdebug
cm_p1c-userdebug
cm_p1l-userdebug
cm_p1n-userdebug
+cm_p1-userdebug
cm_p3100-userdebug
cm_p3110-userdebug
cm_p3113-userdebug
@@ -41,15 +40,19 @@
cm_p5113-userdebug
cm_p930-userdebug
cm_p970-userdebug
+cm_p990-userdebug
+cm_quincyatt-userdebug
+cm_quincytmo-userdebug
cm_skyrocket-userdebug
cm_stingray-userdebug
cm_su640-userdebug
+cm_t769-userdebug
cm_tf101-userdebug
cm_tf201-userdebug
cm_tf300t-userdebug
-cm_toro-userdebug
+cm_tf700t-userdebug
cm_toroplus-userdebug
-cm_t769-userdebug
+cm_toro-userdebug
cm_vibrantmtd-userdebug
cm_ville-userdebug
cm_wingray-userdebug
diff --git a/prebuilt/common/etc/apns-conf-cdma.xml b/prebuilt/common/etc/apns-conf-cdma.xml
index 09c87a1..08eaa8c 100644
--- a/prebuilt/common/etc/apns-conf-cdma.xml
+++ b/prebuilt/common/etc/apns-conf-cdma.xml
@@ -28,10 +28,14 @@
<apn carrier="Boost MMS" mcc="505" mnc="02" apn="mms" user="" password="" server="" proxy="61.88.190.10" port="8070" mmsc="http://mmsc.optus.com.au:8002/" mmsproxy="61.88.190.10" mmsport="8070" type="mms" authtype="3"/>
<apn carrier="Boost Mobile" mcc="505" mnc="02" apn="yesinternet" user="" password="" server="" proxy="" port="" mmsc="" mmsproxy="" mmsport="" type="default,supl" authtype="3"/>
+<!-- MetroPCS: LTE Apn -->
+ <apn carrier="MetroPCS DEFAULT" mcc="311" mnc="660" apn="internet.metropcs" user="" password="" type="default,hipri,admin,mms" authtype="0" mmsc="http://mms.metropcs.net:3128/mmsc" protocol="IP" roaming_protocol="IP" bearer="14" inactivity_timer="7080" />
+ <apn carrier="MetroPCS IMS" mcc="311" mnc="660" apn="ims.metropcs" user="" password="" type="ims" authtype="0" mmsc="http://mms.metropcs.net:3128/mmsc" protocol="IP" roaming_protocol="IP" bearer="14" inactivity_timer="7080" />
+<!-- end MetroPCS: LTE Apn -->
<!-- Sprint -->
- <!-- Modify Apn database for Sprint CDMA MMS support -->
- <apn carrier="Sprint" mcc="310" mnc="120" apn="Sprint" user="Sprint" server="*" password="*" mmsc="http://mms.sprintpcs.com" authtype="3"/>
+ <!-- Sprint CDMA MMS: Use LTE/eHRPD mms apns to avoid LTE/eHRPD service conflicts. -->
+ <!--<apn carrier="Sprint" mcc="310" mnc="120" apn="Sprint" user="Sprint" server="*" password="*" mmsc="http://mms.sprintpcs.com" authtype="3"/>-->
<!-- Modify Apn database for Sprint LTE support -->
<apn carrier="LTE - SPRINT test ISP" mcc="001" mnc="01" apn="n.ispsn" type="default,mms" mmsc="http://mms.sprintpcs.com" mmsproxy="68.28.31.7" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="14" />
@@ -40,7 +44,7 @@
<apn carrier="LTE - SPRINT test ISP" mcc="001" mnc="010" apn="n.ispsn" type="default,mms" mmsc="http://mms.sprintpcs.com" mmsproxy="68.28.31.7" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="14" />
<apn carrier="LTE - SPRINT test OTA" mcc="001" mnc="010" apn="otasn" type="fota" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="14" />
<apn carrier="LTE - SPRINT test PAM" mcc="001" mnc="010" apn="pamsn" type="dun" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="14" />
-<!-- END modify Apn database for Sprint LTE support -->
+ <!-- END modify Apn database for Sprint LTE support -->
<!-- Modify Apn database for Sprint EHRPD support -->
<apn carrier="EHRPD - SPRINT test ISP" mcc="001" mnc="01" apn="n.ispsn" type="default,mms" mmsc="http://mms.sprintpcs.com" mmsproxy="68.28.31.7" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="13" />
diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc
index de5a512..2a31cc3 100644
--- a/prebuilt/common/etc/init.local.rc
+++ b/prebuilt/common/etc/init.local.rc
@@ -1,7 +1,40 @@
# CyanogenMod Extras
+on init
+ export ANDROID_CACHE /cache
+ export TERMINFO /system/etc/terminfo
+ export TERM linux
+
+on post-fs-data
+ mkdir /cache/dalvik-cache 0771 system system
+ chown system system /cache/dalvik-cache
+ chmod 0771 /cache/dalvik-cache
+
+on boot
+ chown system system /sys/block/mmcblk0/queue/scheduler
+ chmod 0664 /sys/block/mmcblk0/queue/scheduler
+
+# allow system to modify ksm control files
+ chown root system /sys/kernel/mm/ksm/pages_to_scan
+ chmod 0664 /sys/kernel/mm/ksm/pages_to_scan
+ chown root system /sys/kernel/mm/ksm/sleep_millisecs
+ chmod 0664 /sys/kernel/mm/ksm/sleep_millisecs
+ chown root system /sys/kernel/mm/ksm/run
+ chmod 0664 /sys/kernel/mm/ksm/run
+ write /sys/kernel/mm/ksm/sleep_millisecs 1500
+ write /sys/kernel/mm/ksm/pages_to_scan 256
+
+# adb over network
+on property:service.adb.tcp.port=5555
+ stop adbd
+ start adbd
+on property:service.adb.tcp.port=-1
+ stop adbd
+ start adbd
+
# Compcache - handle at boot
service compcache /system/bin/handle_compcache
+ class main
user root
group root
oneshot