Merge "vendor/omni: Fixup prebuilt chromium for lollipop" into android-5.1
diff --git a/prebuilt/etc/apns-conf.xml b/prebuilt/etc/apns-conf.xml
index 634382e..9fb4dcf 100644
--- a/prebuilt/etc/apns-conf.xml
+++ b/prebuilt/etc/apns-conf.xml
@@ -645,6 +645,7 @@
<apn carrier="Sprint EHRPD internet" mcc="310" mnc="120" apn="n.ispsn" type="default,mms,supl,hipri" mmsc="http://mms.sprintpcs.com" mmsproxy="68.28.31.7" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="13" />
<apn carrier="Virgin Mobile US" mcc="200" mnc="053" apn="0" port="" mmsproxy="205.239.233.136" mmsport="81" mmsc="http://mmsc.vmobl.com:8088/mms?" type="mms" />
<apn carrier="My Multi Media" mcc="310" mnc="130" apn="mms.c1.ama" user="cell1mms" password="cell1" mmsc="http://mms.iot1.com/amarillo/mms.php" type="mms" />
+ <apn carrier="Cricket AIO" mcc="310" mnc="150" apn="ndo" mmsc="http://mmsc.aiowireless.net" mmsproxy="proxy.aiowireless.net" mmsport="80" type="default,mms,fota,supl" />
<apn carrier="T-Mobile US 160" mcc="310" mnc="160" apn="epc.tmobile.com" user="none" password="none" server="*" mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc" type="default,supl,mms" />
<apn carrier="DataConnect" mcc="310" mnc="170" apn="isp.cingular" type="default,supl" />
<apn carrier="Cingular MMS" mcc="310" mnc="170" apn="wap.cingular" user="WAP@CINGULARGPRS.COM" password="CINGULAR1" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.32" mmsport="8080" type="mms" />
@@ -776,6 +777,10 @@
<apn carrier="Mensajas Multimedia" mcc="334" mnc="02" apn="mms.itelcel.com" user="mmsgprs" password="mmsgprs2003" mmsc="http://mms.itelcel.com/servlets/mms" mmsproxy="148.233.151.240" mmsport="8080" type="mms" />
<apn carrier="Movistar MX" mcc="334" mnc="03" apn="internet.movistar.mx" user="movistar" password="movistar" type="default,supl" />
<apn carrier="Movistar MX MMS" mcc="334" mnc="03" apn="mms.movistar.mx" user="movistar" password="movistar" mmsc="http://mms.movistar.mx" mmsproxy="10.2.20.1" mmsport="9201" type="mms" />
+ <apn carrier="Nextel Navegation" mcc="334" mnc="90" apn="wap.nexteldata.com.mx" type="default,supl" />
+ <apn carrier="Nextel Internet" mcc="334" mnc="90" apn="modem.nexteldata.com.mx" type="supl" />
+ <apn carrier="Nextel Localizacion" mcc="334" mnc="90" apn="location.nexteldata.com.mx" proxy="supl.nexteldata.com.mx" port="7275" type="supl" />
+ <apn carrier="Nextel MMS" mcc="334" mnc="90" apn="mms.nexteldata.com.mx" mmsc="http://3gmms.nexteldata.com.mx" mmsproxy="129.192.129.104" mmsport="8080" type="mms" />
<apn carrier="Digicel JM" mcc="338" mnc="50" apn="wap.digiceljamaica.com" type="default,supl" />
<apn carrier="Digicel JM MMS" mcc="338" mnc="50" apn="wap.digiceljamaica.com" user="wapuser" password="wap03jam" mmsc="http://mms.digicelgroup.com" mmsproxy="172.016.007.012" mmsport="8080" type="mms" />
<apn carrier="Digicel BM" mcc="338" mnc="50" apn="web.digicelbermuda.com" type="default,supl" />
@@ -794,6 +799,48 @@
<apn carrier="Orange MMS" mcc="370" mnc="01" apn="orangeworld" user="orange" password="orange" mmsproxy="172.16.126.70" mmsport="8080" mmsc="http://mms.orange.com.do/servlets/mms" authtype="1" type="mms" />
<apn carrier="Orange DO MMS" mcc="370" mnc="01" apn="orangeworld" mmsc="http://mmr.orangewi.com/servlets/mms" mmsproxy="172.16.126.70" mmsport="8080" type="mms" />
<apn carrier="Orange DO" mcc="370" mnc="01" apn="orangenet.com.do" type="default" />
+ <apn carrier="Prepaid Data" mcc="374" mnc="12" apn="bconnected" server="http://www.google.com" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile BUZZ" mcc="374" mnc="12" apn="buzz" proxy="192.168.210.104" port="8080" server="http://192.168.210.103/operator/wap" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile MMS" mcc="374" mnc="12" apn="mms" mmsproxy="192.168.210.104" mmsport="8080" mmsc="http://192.168.210.104/mmrelay.app" user="" password="" type="mms" />
+ <apn carrier="BMobile Postpaid" mcc="374" mnc="12" apn="internet" type="default,supl" port="8080" />
+ <apn carrier="BMobile Prepaid" mcc="374" mnc="12" apn="bconnected" type="default,supl" port="8080" />
+ <apn carrier="BMobile MMS" mcc="374" mnc="12" apn="mms" type="mms" mmsc="http://192.168.210.104/mmrelay.app" mmsproxy="192.168.210.104" mmsport="8080"/>
+ <apn carrier="BMobile Buzz" mcc="374" mnc="12" apn="buzz" type="default,mms" proxy="192.168.210.104" port="8080" mmsc="http://192.168.210.103/operator/wap"/>
+ <apn carrier="Digicel Web" mcc="374" mnc="13" apn="web" user="" password="" type="default,supl" />
+ <apn carrier="Digicel MMS" mcc="374" mnc="13" apn="wap" proxy="" port="" mmsproxy="172.20.6.12" mmsport="8080" mmsc="http://mmc.digiceltt.com/servlets/mms" user="wap" password="wap" type="mms" />
+ <apn carrier="Digicel TT" mcc="374" mnc="13" apn="web.digiceltt.com" type="default,supl" />
+ <apn carrier="Prepaid Data" mcc="374" mnc="120" apn="bconnected" server="http://www.google.com" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile BUZZ" mcc="374" mnc="120" apn="buzz" proxy="192.168.210.104" port="8080" server="http://192.168.210.103/operator/wap" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile MMS" mcc="374" mnc="120" apn="mms" mmsproxy="192.168.210.104" mmsport="8080" mmsc="http://192.168.210.104/mmrelay.app" user="" password="" type="mms" />
+ <apn carrier="Prepaid Data" mcc="374" mnc="121" apn="bconnected" server="http://www.google.com" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile BUZZ" mcc="374" mnc="121" apn="buzz" proxy="192.168.210.104" port="8080" server="http://192.168.210.103/operator/wap" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile MMS" mcc="374" mnc="121" apn="mms" mmsproxy="192.168.210.104" mmsport="8080" mmsc="http://192.168.210.104/mmrelay.app" user="" password="" type="mms" />
+ <apn carrier="Prepaid Data" mcc="374" mnc="122" apn="bconnected" server="http://www.google.com" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile BUZZ" mcc="374" mnc="122" apn="buzz" proxy="192.168.210.104" port="8080" server="http://192.168.210.103/operator/wap" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile MMS" mcc="374" mnc="122" apn="mms" mmsproxy="192.168.210.104" mmsport="8080" mmsc="http://192.168.210.104/mmrelay.app" user="" password="" type="mms" />
+ <apn carrier="Prepaid Data" mcc="374" mnc="123" apn="bconnected" server="http://www.google.com" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile BUZZ" mcc="374" mnc="123" apn="buzz" proxy="192.168.210.104" port="8080" server="http://192.168.210.103/operator/wap" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile MMS" mcc="374" mnc="123" apn="mms" mmsproxy="192.168.210.104" mmsport="8080" mmsc="http://192.168.210.104/mmrelay.app" user="" password="" type="mms" />
+ <apn carrier="Prepaid Data" mcc="374" mnc="124" apn="bconnected" server="http://www.google.com" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile BUZZ" mcc="374" mnc="124" apn="buzz" proxy="192.168.210.104" port="8080" server="http://192.168.210.103/operator/wap" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile MMS" mcc="374" mnc="124" apn="mms" mmsproxy="192.168.210.104" mmsport="8080" mmsc="http://192.168.210.104/mmrelay.app" user="" password="" type="mms" />
+ <apn carrier="Prepaid Data" mcc="374" mnc="125" apn="bconnected" server="http://www.google.com" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile BUZZ" mcc="374" mnc="125" apn="buzz" proxy="192.168.210.104" port="8080" server="http://192.168.210.103/operator/wap" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile MMS" mcc="374" mnc="125" apn="mms" mmsproxy="192.168.210.104" mmsport="8080" mmsc="http://192.168.210.104/mmrelay.app" user="" password="" type="mms" />
+ <apn carrier="Prepaid Data" mcc="374" mnc="126" apn="bconnected" server="http://www.google.com" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile BUZZ" mcc="374" mnc="126" apn="buzz" proxy="192.168.210.104" port="8080" server="http://192.168.210.103/operator/wap" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile MMS" mcc="374" mnc="126" apn="mms" mmsproxy="192.168.210.104" mmsport="8080" mmsc="http://192.168.210.104/mmrelay.app" user="" password="" type="mms" />
+ <apn carrier="Prepaid Data" mcc="374" mnc="127" apn="bconnected" server="http://www.google.com" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile BUZZ" mcc="374" mnc="127" apn="buzz" proxy="192.168.210.104" port="8080" server="http://192.168.210.103/operator/wap" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile MMS" mcc="374" mnc="127" apn="mms" mmsproxy="192.168.210.104" mmsport="8080" mmsc="http://192.168.210.104/mmrelay.app" user="" password="" type="mms" />
+ <apn carrier="Prepaid Data" mcc="374" mnc="128" apn="bconnected" server="http://www.google.com" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile BUZZ" mcc="374" mnc="128" apn="buzz" proxy="192.168.210.104" port="8080" server="http://192.168.210.103/operator/wap" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile MMS" mcc="374" mnc="128" apn="mms" mmsproxy="192.168.210.104" mmsport="8080" mmsc="http://192.168.210.104/mmrelay.app" user="" password="" type="mms" />
+ <apn carrier="Prepaid Data" mcc="374" mnc="129" apn="bconnected" server="http://www.google.com" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile BUZZ" mcc="374" mnc="129" apn="buzz" proxy="192.168.210.104" port="8080" server="http://192.168.210.103/operator/wap" user="" password="" type="default,supl" />
+ <apn carrier="Bmobile MMS" mcc="374" mnc="129" apn="mms" mmsproxy="192.168.210.104" mmsport="8080" mmsc="http://192.168.210.104/mmrelay.app" user="" password="" type="mms" />
+ <apn carrier="Digicel Web" mcc="374" mnc="130" apn="web" user="" password="" type="default,supl" />
+ <apn carrier="Digicel MMS" mcc="374" mnc="130" apn="wap" proxy="" port="" mmsproxy="172.20.6.12" mmsport="8080" mmsc="http://mmc.digiceltt.com/servlets/mms" user="wap" password="wap" type="mms" />
<apn carrier="Azercell" mcc="400" mnc="01" apn="internet" type="default,supl" />
<apn carrier="Azercell MMS" mcc="400" mnc="01" apn="mms" mmsc="http://mms.azercell.com/cMMSC/post" mmsproxy="10.0.154.101" mmsport="8080" type="mms" />
<apn carrier="Bakcell" mcc="400" mnc="02" apn="mms" mmsc="http://mms.bakcell.com/mms/wapenc" mmsproxy="213.172.091.046" mmsport="8080" type="default,supl,mms" />
diff --git a/sepolicy/shell.te b/sepolicy/shell.te
index 48b4777..b6cfb7c 100644
--- a/sepolicy/shell.te
+++ b/sepolicy/shell.te
@@ -1 +1,6 @@
+###########################
+## OmniROM common sepolicy
+##
+
allow shell adbtcp_prop:property_service set;
+allow shell dalvikcache_data_file:file write;