Merge remote-tracking branch 'PA/kitkat' into kitkat
Conflicts:
main.mk
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b25c15b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/build.sh b/build.sh
index 377ec18..d0130cd 100755
--- a/build.sh
+++ b/build.sh
@@ -40,17 +40,28 @@
EXTRAS="$2"
# Get build version
-MAJOR=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_MAJOR := *' | sed 's/ROM_VERSION_MAJOR := //g')
-MINOR=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_MINOR := *' | sed 's/ROM_VERSION_MINOR := //g')
-MAINTENANCE=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_MAINTENANCE := *' | sed 's/ROM_VERSION_MAINTENANCE := //g')
-TAG=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_TAG := *' | sed 's/ROM_VERSION_TAG := //g')
+PA_MAJOR=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_MAJOR := *' | sed 's/ROM_VERSION_MAJOR := //g')
+PA_MINOR=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_MINOR := *' | sed 's/ROM_VERSION_MINOR := //g')
+PA_MAINTENANCE=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_MAINTENANCE := *' | sed 's/ROM_VERSION_MAINTENANCE := //g')
+PA_TAG=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_TAG := *' | sed 's/ROM_VERSION_TAG := //g')
-if [ -n "$TAG" ]; then
+PSD_MAJOR=$(cat $DIR/vendor/psd/vendor.mk | grep 'PSD_VERSION_MAJOR := *' | sed 's/PSD_VERSION_MAJOR := //g')
+PSD_MINOR=$(cat $DIR/vendor/psd/vendor.mk | grep 'PSD_VERSION_MINOR := *' | sed 's/PSD_VERSION_MINOR := //g')
+PSD_MAINTENANCE=$(cat $DIR/vendor/psd/vendor.mk | grep 'PSD_VERSION_MAINTENANCE := *' | sed 's/PSD_VERSION_MAINTENANCE := //g')
+PSD_TAG=$(cat $DIR/vendor/psd/vendor.mk | grep 'PSD_TYPE := *' | sed 's/PSD_TYPE := //g')
+
+if [ -n "$PA_TAG" ]; then
VERSION=$MAJOR.$MINOR$MAINTENANCE-$TAG
else
VERSION=$MAJOR.$MINOR$MAINTENANCE
fi
+if [ -n "$PSD_TAG" ]; then
+ PSD_VERSION=$PSD_MAINTENANCE-$PSD_TAG-$PSD_MAJOR.$PSD_MINOR
+else
+ PSD_VERSION=$PSD_MAINTENANCE-$PSD_MAJOR.$PSD_MINOR
+fi
+
# If there is no extra parameter, reduce parameters index by 1
if [ "$EXTRAS" == "true" ] || [ "$EXTRAS" == "false" ]; then
SYNC="$2"
@@ -63,7 +74,7 @@
# Get start time
res1=$(date +%s.%N)
-echo -e "${cya}Building ${bldcya}AOSPA $VERSION for $DEVICE ${txtrst}";
+echo -e "${cya}Building ${bldcya}AOSPAL $PSD_TAG $PSD_MAJOR.$PSD_MINOR for $DEVICE ${txtrst}";
echo -e "${bldgrn}Start time: $(date) ${txtrst}"
# Decide what command to execute
diff --git a/configs/pa_overrides.mk b/configs/pa_overrides.mk
index 4745d40..90b1d7e 100644
--- a/configs/pa_overrides.mk
+++ b/configs/pa_overrides.mk
@@ -27,10 +27,10 @@
#endif
# Include ParanoidOTA
-ifneq ($(NO_OTA_BUILD),true)
- PRODUCT_PACKAGES += \
- ParanoidOTA
-endif
+#ifneq ($(NO_OTA_BUILD),true)
+# PRODUCT_PACKAGES += \
+# ParanoidOTA
+#endif
# Extra properties
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/system.mk b/configs/system.mk
index 8c493a1..d16bf22 100644
--- a/configs/system.mk
+++ b/configs/system.mk
@@ -47,3 +47,11 @@
PRODUCT_PROPERTY_OVERRIDES += \
persist.sys.root_access=3
+ ro.build.selinux=1
+
+# SELinux filesystem labels
+PRODUCT_COPY_FILES += \
+ vendor/pa/prebuilt/etc/init.d/50selinuxrelabel:system/etc/init.d/50selinuxrelabel
+
+$(call inherit-product, vendor/psd/configs/psd_board.mk)
+$(call inherit-product, vendor/psd/configs/psd_overrides.mk)
diff --git a/main.mk b/main.mk
index dbcbbab..189faf9 100644
--- a/main.mk
+++ b/main.mk
@@ -23,3 +23,7 @@
include vendor/pa/configs/themes_common.mk
+# Include PSD vendor
+include vendor/psd/main.mk
+
+
diff --git a/prebuilt/bin/backuptool.functions b/prebuilt/bin/backuptool.functions
index ff96b21..f6d2d7f 100755
--- a/prebuilt/bin/backuptool.functions
+++ b/prebuilt/bin/backuptool.functions
@@ -11,13 +11,8 @@
if [ -e "$1" ]; then
local F=`basename "$1"`
local D=`dirname "$1"`
- # dont backup any apps that have odex files, they are useless
- if ( echo "$F" | grep -q "\.apk$" ) && [ -e `echo "$1" | sed -e 's/\.apk$/\.odex/'` ]; then
- echo "Skipping odexed apk $1";
- else
mkdir -p "$C/$D"
cp -p $1 "$C/$D/$F"
- fi
fi
}
diff --git a/prebuilt/etc/apns-conf.xml b/prebuilt/etc/apns-conf.xml
index fec0e96..e007851 100755
--- a/prebuilt/etc/apns-conf.xml
+++ b/prebuilt/etc/apns-conf.xml
@@ -266,7 +266,6 @@
<apn carrier="coop mobil MMS" mcc="238" mnc="01" apn="mms" mmsc="http://192.168.241.114:8002" mmsproxy="194.182.251.15" mmsport="8080" type="mms" />
<apn carrier="Telenor Internet" mcc="238" mnc="02" apn="Internet" type="default,supl" />
<apn carrier="Bibob internet DK" mcc="238" mnc="02" apn="internet.bibob.dk" port="8080" type="default,supl,mms" />
- <apn carrier="Telenor DK" mcc="238" mnc="02" apn="internet" type="default,supl" />
<apn carrier="Bibob MMS DK" mcc="238" mnc="02" apn="mms.bibob.dk" proxy="212.88.64.8" port="8080" mmsc="http://mms.telenor.dk" mmsport="8080" type="mms" />
<apn carrier="Telenor DK MMS" mcc="238" mnc="02" apn="telenor" mmsc="http://mms.telenor.dk" mmsproxy="212.88.64.8" mmsport="8080" authtype="1" type="mms" />
<apn carrier="Onfone" mcc="238" mnc="02" apn="internet.sp.dk" proxy="212.088.064.008" mmsc="http://mms.telenor.dk" mmsproxy="212.088.064.008" mmsport="8080" type="default,supl,mms" />
@@ -463,7 +462,7 @@
<apn carrier="ASTER" mcc="260" mnc="03" apn="aster.internet" user="internet" password="internet" type="default,supl" />
<apn carrier="ASTER MMS" mcc="260" mnc="03" apn="aster.mms" user="mms" password="mms" mmsc="http://mms.aster.pl" mmsproxy="192.168.006.138" mmsport="8080" type="mms" />
<apn carrier="Orange PL" mcc="260" mnc="03" apn="internet" user="internet" password="internet" type="default,supl" />
- <apn carrier="MMS Orange" mcc="260" mnc="03" apn="mms" user="mms" password="mms" mmsc="http://mms.orange.pl" mmsproxy="192.168.6.104" mmsport="8080" type="mms" />
+ <apn carrier="MMS Orange" mcc="260" mnc="03" apn="mms" user="mms" password="mms" mmsc="http://mms.orange.pl" mmsproxy="192.168.6.104" mmsport="8080" authenticationtype="PAP" type="mms" />
<apn carrier="MNI" mcc="260" mnc="03" apn="mni.internet" user="mni.internet" password="mni.internet" type="default,supl" />
<apn carrier="MNI MMS" mcc="260" mnc="03" apn="mni.mms" user="mni.mms" password="mni.mms" mmsc="http://mms.mni.pl/" mmsproxy="192.168.006.135" mmsport="8080" type="mms" />
<apn carrier="Play" mcc="260" mnc="06" apn="internet" type="default,supl" />
@@ -636,7 +635,7 @@
<apn carrier="AWS MMS" mcc="310" mnc="380" apn="proxy" mmsc="http://mmsc.mymmode.com" mmsproxy="10.250.250.55" mmsport="8080" type="mms" />
<apn carrier="Celloneet MMS" mcc="310" mnc="390" apn="mms.celloneet.com" user="user1@mms.celloneet.com" password="celloneet" mmsc="http://mms.celloneet.com/servlets/mms" mmsproxy="63.99.231.135" mmsport="8080" type="mms" />
<apn carrier="ATT" mcc="310" mnc="410" apn="wap.cingular" user="WAP@CINGULARGPRS.COM" mmsc="http://mmsc.cingular.com" mmsproxy="wireless.cingular.com" mmsport="80" type="default,supl,mms" />
- <apn carrier="ATT Phone" mcc="310" mnc="410" apn="phone" mmsc="http://mmsc.mobile.att.net" mmsproxy="proxy.mobile.att.net" mmsport="80" type="default,supl,mms" />
+ <apn carrier="ATT Phone" mcc="310" mnc="410" apn="phone" mmsc="http://mmsc.mobile.att.net" mmsproxy="proxy.mobile.att.net" mmsport="80" type="default,supl,mms,hipri" />
<apn carrier="ATT LTE" mcc="310" mnc="410" apn="pta" mmsc="http://mmsc.mobile.att.net" mmsproxy="proxy.mobile.att.net" mmsport="80" type="default,supl,mms" />
<apn carrier="ATT Broadband" mcc="310" mnc="410" apn="broadband" user="" server="" password="" mmsc="" type="default" />
<apn carrier="ATT Activation" mcc="310" mnc="410" apn="lwaactivate" user="" server="" password="" mmsc="" protocol="IP" />
@@ -1136,18 +1135,33 @@
<apn carrier="Vodafone QA" mcc="427" mnc="02" apn="web.vodafone.com.qa" type="default,supl" />
<apn carrier="Beeline UZ" mcc="434" mnc="04" apn="internet.beeline.uz" user="beeline" password="beeline" type="default,supl" />
<apn carrier="Beeline UZ MMS" mcc="434" mnc="04" apn="mms.beeline.uz" user="beeline" password="beeline" mmsc="http://mms" mmsproxy="172.30.30.166" mmsport="8080" type="mms" />
- <apn carrier="NTT Docomo(bizho)" mcc="440" mnc="10" apn="mpr2.bizho.net" type="default,supl,mms" />
- <apn carrier="NTT Docomo(mopera)" mcc="440" mnc="10" apn="mopera.net" type="default,supl,mms" />
- <apn carrier="NTT Docomo(flat)" mcc="440" mnc="10" apn="mopera.flat.foma.ne.jp" type="default,supl,mms" />
- <apn carrier="NTT Docomo(128k)" mcc="440" mnc="10" apn="mpr.ex-pkt.net" type="default,supl,mms" />
- <apn carrier="NTT Docomo(mopera ff)" mcc="440" mnc="10" apn="open.mopera.net" type="default,supl,mms" />
- <apn carrier="NTT Docomo(spmode)" mcc="440" mnc="10" apn="spmode.ne.jp" type="default,supl" />
- <apn carrier="b-mobile(sumaho)" mcc="440" mnc="10" apn="bmobile.ne.jp" user="bmobile@spd" password="bmobile" type="default,supl,mms" />
- <apn carrier="Softbank(open)" mcc="440" mnc="20" apn="open.softbank.ne.jp" user="opensoftbank" password="ebMNuX1FIHg9d3DA" mmsc="http://mms/" mmsproxy="mmsopen.softbank.ne.jp" mmsport="8080" type="default,supl,mms" />
- <apn carrier="Softbank(smile.world)" mcc="440" mnc="20" apn="smile.world" user="dna1trop" password="so2t3k3m2a" mmsc="http://mms/" mmsproxy="smilemms.softbank.ne.jp" mmsport="8080" type="default,supl,mms" />
- <apn carrier="Softbank(desire)" mcc="440" mnc="20" apn="open.softbank.ne.jp" user="softbankX06HT" password="KfNSDrQQs2AtFQ9M" mmsc="http://mms/" mmsproxy="andmms.softbank.ne.jp" mmsport="8080" type="default,supl,mms" />
- <apn carrier="Softbank(datasim)" mcc="440" mnc="20" apn="softbank" user="ai@softbank" password="softbank" type="default,supl" />
- <apn carrier="Softbank(internet)" mcc="420" mnc="20" apn="andglobal.softbank.ne.jp" user="andg001softbank" password="pumbbghkpgyysxa" mmsc="http://mms/" mmsproxy="andmms.softbank.ne.jp" mmsport="8080" type="default,mms" />
+ <apn carrier="mopera U" mcc="440" mnc="10" apn="mopera.net" type="default,supl,mms" />
+ <apn carrier="mopera U Bizho" mcc="440" mnc="10" apn="mpr2.bizho.net" type="default,supl,mms" />
+ <apn carrier="mopera U FF" mcc="440" mnc="10" apn="open.mopera.net" type="default,supl,mms" />
+ <apn carrier="mopera U Flat" mcc="440" mnc="10" apn="mopera.flat.foma.ne.jp" type="default,supl,mms" />
+ <apn carrier="spモード" mcc="440" mnc="10" apn="spmode.ne.jp" type="default,supl" />
+ <apn carrier="b-mobile 1GB/Fair" mcc="440" mnc="10" apn="bmobile.ne.jp" user="bmobile@fr" password="bmobile" authtype="3" />
+ <apn carrier="b-mobile 6ヶ月/スマートSIM" mcc="440" mnc="10" apn="bmobile.ne.jp" user="bmobile@4g" password="bmobile" authtype="3" />
+ <apn carrier="b-mobile U300" mcc="440" mnc="10" apn="bmobile.ne.jp" user="bmobile@u300" password="bmobile" authtype="3" />
+ <apn carrier="b-mobile X SIM" mcc="440" mnc="10" apn="bmobile.ne.jp" user="bmobile@xsim" password="bmobile" authtype="3" />
+ <apn carrier="b-mobile アマゾン" mcc="440" mnc="10" apn="bmobile.ne.jp" user="bmobile@am" password="bmobile" authtype="3" />
+ <apn carrier="b-mobile イオン" mcc="440" mnc="10" apn="bmobile.ne.jp" user="bmobile@aeon" password="bmobile" authtype="3" />
+ <apn carrier="b-mobile スマホ電話" mcc="440" mnc="10" apn="bmobile.ne.jp" user="bmobile@spd" password="bmobile" type="default,supl,mms" />
+ <apn carrier="b-mobile ヨドバシ" mcc="440" mnc="10" apn="bmobile.ne.jp" user="bmobile@zsim" password="bmobile" authtype="3" />
+ <apn carrier="EMOBILE 4G-S" mcc="440" mnc="20" apn="plus.acs.jp" user="plusw6q9tattkmpk" password="msfbbam83bsdetxb" mmsc="http://mms-s" mmsproxy="andmms.plusacs.ne.jp" mmsport="8080" authtype="2" type="default,supl,mms" />
+ <apn carrier="SoftBank Andglobal" mcc="440" mnc="20" apn="andglobal.softbank.ne.jp" user="andg001softbank" password="pumbbghkpgyysxa" mmsc="http://mms/" mmsproxy="andmms.softbank.ne.jp" mmsport="8080" type="default,mms" />
+ <apn carrier="SoftBank Andoworld" mcc="440" mnc="20" apn="andoworld.softbank.ne.jp" authtype="2" type="default,mms,supl,hipri" />
+ <apn carrier="SoftBank JPspir" mcc="440" mnc="20" apn="jpspir" user="sirobit" password="amstkoi" mmsc="http://mms/" mmsproxy="smilemms.softbank.ne.jp" mmsport="8080" type="default,supl,mms" />
+ <apn carrier="SoftBank Open" mcc="440" mnc="20" apn="open.softbank.ne.jp" user="opensoftbank" password="ebMNuX1FIHg9d3DA" mmsc="http://mms/" mmsproxy="mmsopen.softbank.ne.jp" mmsport="8080" type="default,supl,mms" />
+ <apn carrier="SoftBank Open Desire" mcc="440" mnc="20" apn="open.softbank.ne.jp" user="softbankX06HT" password="KfNSDrQQs2AtFQ9M" mmsc="http://mms/" mmsproxy="andmms.softbank.ne.jp" mmsport="8080" type="default,supl,mms" />
+ <apn carrier="SoftBank Pay for Use" mcc="440" mnc="20" apn="softbank" user="ai@softbank" password="softbank" type="default,supl" />
+ <apn carrier="SoftBank Plus" mcc="440" mnc="20" apn="plus.softbank" user="plus" password="softbank" mmsc="http://mms/" mmsproxy="andmms.softbank.ne.jp" mmsport="8080" authtype="3" type="default,supl,mms" />
+ <apn carrier="SoftBank SBM" mcc="440" mnc="20" apn="sbm" user="data" password="softbank" />
+ <apn carrier="SoftBank SBM4GLTE" mcc="440" mnc="20" apn="sbm4glte" user="data" password="softbank" />
+ <apn carrier="SoftBank Smile World" mcc="440" mnc="20" apn="smile.world" user="dna1trop" password="so2t3k3m2a" mmsc="http://mms/" mmsproxy="smilemms.softbank.ne.jp" mmsport="8080" authtype="1" type="default,supl,mms" />
+ <apn carrier="SoftBank プリモバイル" mcc="440" mnc="20" apn="mailwebservice.softbank.ne.jp" user="softbank" password="qceffknarlurqgbl" server="http://mms/" proxy="sbwapproxy.softbank.ne.jp" port="8080" mmsc="http://mms/" mmsproxy="sbmmsproxy.softbank.ne.jp" mmsport="8080" authtype="3" />
+ <apn carrier="au LTE NET" mcc="440" mnc="50" apn="uno.au-net.ne.jp" user="685840734641020@uno.au-net.ne.jp" password="KpyrR6BP" authtype="2" type="default,mms,supl,hipri" state="readonly" protocol="IPV4V6" roaming_protocol="IP" />
+ <apn carrier="au LTE NET for DATA" mcc="440" mnc="50" apn="au.au-net.ne.jp" user="user@au.au-net.ne.jp" password="au" authtype="2" type="default,mms,supl,hipri" state="readonly" protocol="IPV4V6" roaming_protocol="IP" />
<apn carrier="SKT3G" mcc="450" mnc="05" apn="web.sktelecom.com" mmsc="http://omms.nate.com:9082/oma_mms" mmsproxy="smart.nate.com" mmsport="9093" type="default,supl,mms" />
<apn carrier="SK Telecom (Roaming)" mcc="450" mnc="05" apn="roaming.sktelecom.com" server="*" mmsc="vmms.nate.com" mmsport="8082" type="default,supl,mms" />
<apn carrier="SKT LTE" mcc="450" mnc="05" apn="lte.sktelecom.com" mmsc="http//omms.nate.com:9082/oma_mms" mmsproxy="smart.nate.com" mmsport="9093" type="default,supl,mms" />
@@ -1205,9 +1219,9 @@
<apn carrier="China Mobile MMS" mcc="460" mnc="02" apn="cmwap" proxy="10.0.0.172" port="80" mmsc="http://mmsc.monternet.com" mmsproxy="10.0.0.172" mmsport="80" type="mms" />
<apn carrier="中国移动 (China Mobile) GPRS" mcc="460" mnc="07" apn="cmnet" type="default,supl" />
<apn carrier="中国移动彩信 (China Mobile)" mcc="460" mnc="07" apn="cmwap" proxy="10.0.0.172" port="80" mmsc="http://mmsc.monternet.com" mmsproxy="10.0.0.172" mmsport="80" type="mms" />
+ <apn carrier="FarEasTone" mcc="466" mnc="01" apn="internet" type="default,supl" />
<apn carrier="遠傳電信(Far EasTone) (Fetnet01)" mcc="466" mnc="01" apn="fetnet01" proxy="210.241.199.199" port="80" type="default,supl" />
<apn carrier="FarEasTone MMS" mcc="466" mnc="01" apn="fetnet01" mmsc="http://mms" mmsproxy="210.241.199.199" mmsport="9201" type="mms" />
- <apn carrier="FarEasTone" mcc="466" mnc="01" apn="internet" type="default,supl" />
<apn carrier="KGT" mcc="466" mnc="88" apn="internet" type="default,supl" />
<apn carrier="KGT MMS" mcc="466" mnc="88" apn="kgtmms" mmsc="http://mms.kgtmms.net.tw/mms/wapenc" mmsproxy="172.28.33.5" mmsport="8080" type="mms" />
<apn carrier="震旦電信(AURORA) (MMS)" mcc="466" mnc="89" apn="aurorawap" mmsc="http://auroramms" mmsproxy="172.24.128.36" mmsport="8080" type="mms" />
@@ -1290,7 +1304,8 @@
<apn carrier="XL-MMS" mcc="510" mnc="11" apn="www.xlmms.net" user="xlgprs" password="proxl" mmsc="http://mmc.xl.net.id/servlets/mms" mmsproxy="202.152.240.50" mmsport="8080" type="mms" />
<apn carrier="IM3 MMS" mcc="510" mnc="21" apn="indosatmms" user="indosat" password="indosat" mmsc="http://mmsc.indosat.com" mmsproxy="10.19.19.19" mmsport="8080" type="mms" />
<apn carrier="IM3 Internet" mcc="510" mnc="21" apn="www.indosat-m3.net" user="gprs" password="im3" type="default,supl" />
- <apn carrier="3 ID" mcc="510" mnc="89" apn="3gprs" user="3gprs" password="3gprs" proxy="10.4.0.10" port="3128" type="default,supl" />
+ <apn carrier="3 ID" mcc="510" mnc="89" apn="3gprs" user="3gprs" password="3gprs" type="default,supl" />
+ <apn carrier="3 ID INTERNET" mcc="510" mnc="89" apn="3data" user="3data" password="3data" type="default,supl" />
<apn carrier="3 ID MMS" mcc="510" mnc="89" apn="3mms" user="3mms" password="3mms" mmsc="http://mmsthree.co.id" mmsproxy="10.4.0.10" mmsport="3128" type="mms" />
<apn carrier="GLOBE" mcc="515" mnc="02" apn="internet.globe.com.ph" type="default,supl" />
<apn carrier="GLOBE MMS" mcc="515" mnc="02" apn="real.globe.com.ph" user="globe" password="globe" mmsc="http://192.40.100.22:10021/mmsc" mmsproxy="192.40.100.20" mmsport="8080" type="mms" />
@@ -1447,13 +1462,11 @@
<apn carrier="Tigo SV MMS" mcc="706" mnc="03" apn="mms.tigo.sv" mmsc="http://mms" mmsproxy="10.16.27.12" mmsport="8888" type="mms" />
<apn carrier="Movistar SV" mcc="706" mnc="04" apn="internet.movistar.sv" user="movistarsv" password="movistarsv" type="default,supl" />
<apn carrier="Movistar SV MMS" mcc="706" mnc="04" apn="mms.movistar.sv" user="movistarsv" password="movistarsv" mmsc="http://mms.movistar.sv" mmsproxy="10.12.20.1" mmsport="80" type="mms" />
- <apn carrier="Movistar SV" mcc="706" mnc="040" apn="internet.movistar.sv" user="movistarsv" password="movistarsv" type="default,supl" />
- <apn carrier="Movistar SV MMS" mcc="706" mnc="040" apn="mms.movistar.sv" user="movistarsv" password="movistarsv" mmsc="http://mms.movistar.sv" mmsproxy="10.12.20.1" mmsport="80" type="mms" />
<apn carrier="Cable and Wireless Panama" mcc="714" mnc="01" apn="apn01.cwpanama.com.pa" type="default,supl" />
<apn carrier="Cable and Wireless Panama MMS" mcc="714" mnc="01" apn="apn02.cwpanama.com.pa" mmsc="http://mms.zonamovil.com.pa:80/i.bin" mmsproxy="172.25.3.5" mmsport="8080" type="mms" />
<apn carrier="Movistar AG" mcc="722" mnc="007" apn="internet.unifon" user="wap" password="password" type="default,supl" />
<apn carrier="Movistar AG MMS" mcc="722" mnc="007" apn="mms.gprs.unifon.com.ar" user="mms" password="mms" mmsc="http://mms.tmovil.cl/" mmsproxy="200.068.032.239" mmsport="9201" type="mms" />
- <apn carrier="Movistar AR" mcc="722" mnc="07" apn="wap.gprs.unifon.com.ar" proxy="200.5.86.10" port="80" user="wap" password="wap" authenticationtype="PAP" type="default,supl" />
+ <apn carrier="Movistar AR" mcc="722" mnc="07" apn="wap.gprs.unifon.com.ar" proxy="200.5.68.10" port="8080" user="wap" password="wap" authenticationtype="PAP" type="default,supl" />
<apn carrier="Movistar AR MMS" mcc="722" mnc="07" apn="mms.gprs.unifon.com.ar" user="mms" password="mms" mmsc="http://movistar.com.ar" mmsproxy="200.68.32.239" mmsport="8080" authenticationtype="PAP" type="mms" />
<apn carrier="Personal" mcc="722" mnc="34" apn="datos.personal.com" user="datos" password="datos" type="default,supl" />
<apn carrier="Personal MMS" mcc="722" mnc="34" apn="mms" user="mms" password="mms" mmsc="http://mms.personal.com/" mmsproxy="172.025.007.031" mmsport="9201" type="mms" />
diff --git a/prebuilt/etc/init.d/50selinuxrelabel b/prebuilt/etc/init.d/50selinuxrelabel
new file mode 100644
index 0000000..dfa576d
--- /dev/null
+++ b/prebuilt/etc/init.d/50selinuxrelabel
@@ -0,0 +1,55 @@
+#!/system/bin/sh
+
+L="log -p i -t SELinuxLabel"
+
+# Bail out early if not on a SELinux build
+getprop ro.build.selinux | grep -q 1 || exit
+if [ ! -f /file_contexts ]; then
+ exit
+fi
+
+LABELDATA=0
+LABELDALVIKCACHE=0
+
+# Test /data
+ls -Zd /data/system | grep -q unlabeled
+if [ $? -eq 0 ]; then
+ $L "userdata is unlabeled, fixing..."
+ LABELDATA=1
+fi
+
+# Double-check other files under /data
+ls -Z /data/misc/wifi/wpa_supplicant.conf | grep -q "wifi_"
+if [ $? -eq 1 ]; then
+ $L "data is mis-labeled, fixing..."
+ LABELDATA=1
+fi
+
+ls -Zd /data/dalvik-cache | grep -q unlabeled
+if [ $? -eq 0 ]; then
+ $L "dalvik-cache is unlabeled, fixing..."
+ LABELDALVIKCACHE=1
+fi
+
+ls -Zd /cache/dalvik-cache | grep -q unlabeled
+if [ $? -eq 0 ]; then
+ $L "dalvik-cache is unlabeled, fixing..."
+ LABELDALVIKCACHE=1
+fi
+
+
+if [ $LABELDATA = "1" ]; then
+ $L "/data relabel starting..."
+ restorecon -R /data
+ $L "/data relabel complete"
+ $L "/cache relabel starting..."
+ restorecon -R /cache
+ $L "/cache relabel complete"
+fi
+
+if [ $LABELDALVIKCACHE = "1" ]; then
+ $L "dalvik-cache relabel starting..."
+ restorecon -R /data/dalvik-cache
+ restorecon -R /cache/dalvik-cache
+ $L "dalvik-cache relabel complete"
+fi
diff --git a/prebuilt/etc/init.d/91fstrim b/prebuilt/etc/init.d/91fstrim
new file mode 100755
index 0000000..a8c3e72
--- /dev/null
+++ b/prebuilt/etc/init.d/91fstrim
@@ -0,0 +1,5 @@
+#!/system/bin/sh
+# fstrim NAND to improve speed
+fstrim /system
+fstrim /data
+fstrim /cache
diff --git a/prebuilt/etc/init.pa.rc b/prebuilt/etc/init.pa.rc
index 58fc197..f86cd74 100644
--- a/prebuilt/etc/init.pa.rc
+++ b/prebuilt/etc/init.pa.rc
@@ -17,10 +17,77 @@
start sysinit
on boot
+ # interactive governor
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/timer_rate
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/timer_rate
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/timer_slack
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/timer_slack
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/min_sample_time
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/min_sample_time
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/target_loads
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/target_loads
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/boost
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/boost
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/boostpulse
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/boostpulse
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/input_boost
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/input_boost
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration
+ chown system system /sys/devices/system/cpu/cpufreq/interactive/io_is_busy
+ chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/io_is_busy
+
+ # ondemand governor
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/boostfreq
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/boostfreq
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/boostpulse
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/boostpulse
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/boosttime
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/boosttime
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/down_differential
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/down_differential
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/powersave_bias
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/powersave_bias
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/up_threshold
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/up_threshold
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/input_boost
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/input_boost
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_multi_core
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_multi_core
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/down_differential_multi_core
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/down_differential_multi_core
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/optimal_freq
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/optimal_freq
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/sync_freq
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/sync_freq
+ chown system system /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_any_cpu_load
+ chmod 0660 /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_any_cpu_load
+
+ # Assume SMP uses shared cpufreq policy for all CPUs
+ chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+ chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+ chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
+ chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
+ chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
+ chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
+
+ # I/O scheduler
chown system system /sys/block/mmcblk0/queue/scheduler
chmod 0664 /sys/block/mmcblk0/queue/scheduler
-# allow system to modify ksm control files
+ # 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
@@ -30,6 +97,10 @@
write /sys/kernel/mm/ksm/sleep_millisecs 1500
write /sys/kernel/mm/ksm/pages_to_scan 256
+ # set permission to notify_on_migrate node (used by power hal)
+ chown system system /dev/cpuctl/apps/cpu.notify_on_migrate
+ chmod 0644 /dev/cpuctl/apps/cpu.notify_on_migrate
+
# adb over network
on property:service.adb.tcp.port=5555
stop adbd
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 2365224..d7aea1b 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -42,4 +42,3 @@
ifeq (pa_toroplus,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_toroplus.mk
endif
-
diff --git a/products/pa_deb.mk b/products/pa_deb.mk
index 89652ea..f6f8f5d 100644
--- a/products/pa_deb.mk
+++ b/products/pa_deb.mk
@@ -27,6 +27,9 @@
# Inherit AOSP device configuration
$(call inherit-product, device/asus/deb/full_deb.mk)
+# Inherit PSD device product
+$(call inherit-product, vendor/psd/products/psd_deb.mk)
+
# Override AOSP build properties
PRODUCT_NAME := pa_deb
PRODUCT_BRAND := Google
diff --git a/products/pa_grouper.mk b/products/pa_grouper.mk
index 04fab2d..5d34324 100644
--- a/products/pa_grouper.mk
+++ b/products/pa_grouper.mk
@@ -27,6 +27,9 @@
# Inherit AOSP device configuration
$(call inherit-product, device/asus/grouper/full_grouper.mk)
+# Inherit PSD device product
+$(call inherit-product, vendor/psd/products/psd_grouper.mk)
+
# Override AOSP build properties
PRODUCT_NAME := pa_grouper
PRODUCT_BRAND := Google
@@ -34,4 +37,5 @@
PRODUCT_MANUFACTURER := Asus
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=nakasi BUILD_FINGERPRINT="google/nakasi/grouper:4.4.2/KOT49H/937116:user/release-keys"
PRIVATE_BUILD_DESC="nakasi-user 4.4.2 KOT49H 937116 release-keys"
+
endif
diff --git a/products/pa_maguro.mk b/products/pa_maguro.mk
index 35dfa33..c3730a6 100644
--- a/products/pa_maguro.mk
+++ b/products/pa_maguro.mk
@@ -28,6 +28,9 @@
# Inherit AOSP device configuration
$(call inherit-product, device/samsung/maguro/full_maguro.mk)
+# Inherit PSD device product
+$(call inherit-product, vendor/psd/products/psd_maguro.mk)
+
# Override AOSP build properties
PRODUCT_NAME := pa_maguro
PRODUCT_BRAND := Google
diff --git a/products/pa_mako.mk b/products/pa_mako.mk
index 60302d9..8443897 100644
--- a/products/pa_mako.mk
+++ b/products/pa_mako.mk
@@ -28,6 +28,9 @@
# Inherit AOSP device configuration
$(call inherit-product, device/lge/mako/full_mako.mk)
+# Inherit PSD device product
+$(call inherit-product, vendor/psd/products/psd_mako.mk)
+
# Override AOSP build properties
PRODUCT_NAME := pa_mako
PRODUCT_BRAND := Google
diff --git a/products/pa_manta.mk b/products/pa_manta.mk
index ba4b7dd..fc2c5c5 100644
--- a/products/pa_manta.mk
+++ b/products/pa_manta.mk
@@ -27,6 +27,9 @@
# Inherit AOSP device configuration
$(call inherit-product, device/samsung/manta/full_manta.mk)
+# Inherit PSD device product
+$(call inherit-product, vendor/psd/products/psd_manta.mk)
+
# Override AOSP build properties
PRODUCT_NAME := pa_manta
PRODUCT_BRAND := google
diff --git a/products/pa_tilapia.mk b/products/pa_tilapia.mk
index 237b391..6d4fc6f 100644
--- a/products/pa_tilapia.mk
+++ b/products/pa_tilapia.mk
@@ -27,6 +27,9 @@
# Inherit AOSP device configuration
$(call inherit-product, device/asus/tilapia/full_tilapia.mk)
+# Inherit PSD device product
+$(call inherit-product, vendor/psd/products/psd_tilapia.mk)
+
# Override AOSP build properties
PRODUCT_NAME := pa_tilapia
PRODUCT_BRAND := Google
diff --git a/products/pa_toro.mk b/products/pa_toro.mk
index 88dd3b7..4e93ad1 100644
--- a/products/pa_toro.mk
+++ b/products/pa_toro.mk
@@ -28,6 +28,9 @@
# Inherit AOSP device configuration
$(call inherit-product, device/samsung/toro/full_toro.mk)
+# Inherit PSD device product
+$(call inherit-product, vendor/psd/products/psd_toro.mk)
+
# Override AOSP build properties
PRODUCT_NAME := pa_toro
PRODUCT_BRAND := Google
diff --git a/products/pa_toroplus.mk b/products/pa_toroplus.mk
index 403368b..94ee771 100644
--- a/products/pa_toroplus.mk
+++ b/products/pa_toroplus.mk
@@ -28,6 +28,9 @@
# Inherit AOSP device configuration
$(call inherit-product, device/samsung/toroplus/full_toroplus.mk)
+# Inherit PSD device product
+$(call inherit-product, vendor/psd/products/psd_toroplus.mk)
+
# Override AOSP build properties
PRODUCT_NAME := pa_toroplus
PRODUCT_BRAND := Google
diff --git a/vendorsetup.sh b/vendorsetup.sh
index a69aa33..4483e0e 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -7,4 +7,7 @@
add_lunch_combo pa_manta-userdebug
add_lunch_combo pa_maguro-userdebug
add_lunch_combo pa_toro-userdebug
-add_lunch_combo pa_toroplus-userdebug
\ No newline at end of file
+add_lunch_combo pa_toroplus-userdebug
+
+# Add the lunch combo here if someone wants odex
+add_lunch_combo pa_hammerhead-user