am 4d383c60: Merge "Fix clang -Wc++11-narrowing warnings."
* commit '4d383c60d9423729b12bbdbc684b5df35c20c1f6':
Fix clang -Wc++11-narrowing warnings.
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 8b61cc0..39a14a7 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -731,12 +731,41 @@
type="mms"
/>
+ <apn carrier="Euskaltel Internet"
+ mcc="214"
+ mnc="03"
+ apn="internet.euskaltel.mobi"
+ user="CLIENTE"
+ password="EUSKALTEL"
+ authtype="1"
+ type="default,supl"
+ mvno_type="imsi"
+ mvno_match_data="2140359"
+ />
+
+ <apn carrier="Euskaltel MMS"
+ mcc="214"
+ mnc="03"
+ apn="euskaltelmms.euskaltel.mobi"
+ user="MMS"
+ password="EUSKALTEL"
+ authtype="1"
+ mmsc="http://mms.euskaltel.mobi"
+ mmsproxy="172.16.18.74"
+ mmsport="8080"
+ type="mms"
+ mvno_type="imsi"
+ mvno_match_data="2140359"
+ />
+
<apn carrier="Carrefour"
mcc="214"
mnc="03"
apn="CARREFOURINTERNET"
authtype="1"
type="default,supl"
+ mvno_type="imsi"
+ mvno_match_data="2140352"
/>
<apn carrier="Carrefour MMS"
@@ -749,6 +778,8 @@
mmsproxy="172.22.188.25"
mmsport="8080"
authtype="1"
+ mvno_type="imsi"
+ mvno_match_data="2140352"
type="mms"
/>
@@ -819,6 +850,7 @@
mcc="214"
mnc="06"
apn="internet.mundo-r.com"
+ authtype="1"
type="default,supl"
mvno_match_data="2140612"
mvno_type="imsi"
@@ -827,10 +859,11 @@
<apn carrier="MMS R"
mcc="214"
mnc="06"
- apn="euskaltelmms.euskaltel.mobi"
+ apn="mms.mundo-r.com"
mmsc="http://mms.mundo-r.com"
mmsproxy="10.0.157.169"
mmsport="8080"
+ authtype="1"
type="mms"
mvno_match_data="2140612"
mvno_type="imsi"
@@ -886,18 +919,6 @@
mvno_type="imsi"
/>
- <apn carrier="Movistar MMS"
- mcc="214"
- mnc="07"
- apn="telefonica.es"
- user="telefonica"
- password="telefonica"
- mmsc="http://mms.movistar.com"
- mmsproxy="10.138.255.5"
- mmsport="8080"
- type="mms"
- />
-
<apn carrier="Movistar"
mcc="214"
mnc="07"
@@ -906,7 +927,11 @@
password="telefonica"
proxy="10.138.255.133"
port="8080"
- type="default,supl"
+ mmsc="http://mms.movistar.com"
+ mmsproxy="10.138.255.5"
+ mmsport="8080"
+ authtype="1"
+ type="default,supl,mms"
/>
<apn carrier="Jazztel Internet"
@@ -1853,10 +1878,10 @@
type="mms"
/>
- <apn carrier="YESSS! GPRS"
+ <apn carrier="Internet"
mcc="232"
mnc="12"
- apn="web.yesss.at"
+ apn="webapn.at"
type="default,supl"
/>
@@ -2376,6 +2401,27 @@
type="default,supl"
/>
+ <apn carrier="Internet"
+ mcc="240"
+ mnc="01"
+ apn="halebop.telia.se"
+ type="default,supl"
+ mvno_match_data="240017"
+ mvno_type="imsi"
+ />
+
+ <apn carrier="MMS"
+ mcc="240"
+ mnc="01"
+ apn="mms.telia.se"
+ mmsc="http://mmss"
+ mmsproxy="193.209.134.132"
+ mmsport="80"
+ type="mms"
+ mvno_match_data="240017"
+ mvno_type="imsi"
+ />
+
<apn carrier="Halebop Internet"
mcc="240"
mnc="017"
@@ -2436,14 +2482,25 @@
type="default,supl"
/>
- <apn carrier="Tele2"
+ <apn carrier="Tele2 Internet"
+ mcc="240"
+ mnc="07"
+ apn="internet.tele2.se"
+ type="default,supl"
+ mvno_match_data="Tele2"
+ mvno_type="spn"
+ />
+
+ <apn carrier="Tele2 MMS"
mcc="240"
mnc="07"
apn="internet.tele2.se"
mmsc="http://mmsc.tele2.se"
mmsproxy="130.244.202.30"
mmsport="8080"
- type="default,supl,mms"
+ type="mms"
+ mvno_match_data="Tele2"
+ mvno_type="spn"
/>
<apn carrier="Tele2 Internet"
@@ -2835,10 +2892,6 @@
mcc="246"
mnc="03"
apn="internet.tele2.lt"
- user="wap"
- password="wap"
- proxy="130.244.196.90"
- port="8080"
mmsc="http://mmsc.tele2.lt/"
mmsproxy="193.12.40.29"
mmsport="8080"
@@ -2963,16 +3016,14 @@
type="default,supl"
/>
- <apn carrier="Tele2 Internet"
+ <apn carrier="TELE2 Internet"
mcc="248"
mnc="03"
apn="internet.tele2.ee"
type="default,supl"
- mvno_match_data="24803005x"
- mvno_type="imsi"
/>
- <apn carrier="Tele2 MMS"
+ <apn carrier="TELE2 MMS"
mcc="248"
mnc="03"
apn="mms.tele2.ee"
@@ -2980,8 +3031,6 @@
mmsproxy="193.12.40.6"
mmsport="8080"
type="mms"
- mvno_match_data="24803005x"
- mvno_type="imsi"
/>
<apn carrier="Smart/Ultra MMS"
@@ -2992,29 +3041,6 @@
mmsproxy="193.12.40.6"
mmsport="8080"
type="mms"
- mvno_match_data="24803005x"
- mvno_type="imsi"
- />
-
- <apn carrier="Tele2 Internet"
- mcc="248"
- mnc="03"
- apn="internet.tele2.ee"
- type="default,supl"
- mvno_match_data="24803000x"
- mvno_type="imsi"
- />
-
- <apn carrier="Smart/Ultra MMS"
- mcc="248"
- mnc="03"
- apn="internet.tele2.ee"
- mmsc="http://mmsc.tele2.ee"
- mmsproxy="193.12.40.6"
- mmsport="8080"
- type="mms"
- mvno_match_data="24803000x"
- mvno_type="imsi"
/>
<apn carrier="MTS Internet"
@@ -3883,6 +3909,39 @@
type="mms"
/>
+ <apn carrier="T-2"
+ mcc="293"
+ mnc="64"
+ apn="internet.t-2.net"
+ mmsc="http://www.mms.t-2.net:8002"
+ mmsproxy="172.20.18.137"
+ mmsport="8080"
+ type="default,supl,mms"
+ />
+
+ <apn carrier="Tusmobil Internet"
+ mcc="293"
+ mnc="70"
+ apn="internet.tusmobil.si"
+ user="tusmobil"
+ password="internet"
+ authtype="1"
+ type="default,supl"
+ />
+
+ <apn carrier="Tusmobil MMS"
+ mcc="293"
+ mnc="70"
+ apn="mms.tusmobil.si"
+ user="tusmobil"
+ password="mms"
+ authtype="1"
+ mmsc="http://mms.tusmobil.si:8002"
+ mmsproxy="91.185.221.85"
+ mmsport="8080"
+ type="mms"
+ />
+
<apn carrier="T-Mobile MK Internet"
mcc="294"
mnc="01"
@@ -5749,6 +5808,13 @@
type="mms"
/>
+ <apn carrier="ALTEL INTERNET"
+ mcc="401"
+ mnc="07"
+ apn="Internet"
+ type="default"
+ />
+
<apn carrier="Tele2 Internet"
mcc="401"
mnc="77"
@@ -5766,6 +5832,13 @@
type="mms"
/>
+ <apn carrier="ALTEL INTERNET"
+ mcc="401"
+ mnc="07"
+ apn="Internet"
+ type="default"
+ />
+
<apn carrier="B-Mobile"
mcc="402"
mnc="11"
@@ -12531,6 +12604,23 @@
type="default,supl,mms"
/>
+ <apn carrier="Home Cellular Internet"
+ mcc="425"
+ mnc="15"
+ apn="hcminternet"
+ type="default,supl"
+ />
+
+ <apn carrier="Home Cellular MMS"
+ mcc="425"
+ mnc="15"
+ apn="hcmMMS"
+ mmsc="http://82.166.164.229:9000/mmsc"
+ mmsproxy="82.166.164.229"
+ mmsport="8898"
+ type="mms"
+ />
+
<apn carrier="Rami Levi 3G"
mcc="425"
mnc="16"
@@ -14610,6 +14700,46 @@
type="mms"
/>
+ <apn carrier="TRUE-H INTERNET"
+ mcc="520"
+ mnc="04"
+ apn="internet"
+ user="true"
+ password="true"
+ authtype="1"
+ type="default,supl"
+ />
+
+ <apn carrier="TRUE-H MMS"
+ mcc="520"
+ mnc="04"
+ apn="hmms"
+ user="true"
+ password="true"
+ authtype="1"
+ mmsc="http://mms.trueh.com:8002/"
+ mmsproxy="10.4.7.39"
+ mmsport="8080"
+ type="mms"
+ />
+
+ <apn carrier="dtac Internet"
+ mcc="520"
+ mnc="05"
+ apn="www.dtac.co.th"
+ type="default,supl"
+ />
+
+ <apn carrier="dtac MMS"
+ mcc="520"
+ mnc="05"
+ apn="mms"
+ mmsc="http://mms2.dtac.co.th:8002/"
+ mmsproxy="10.10.10.10"
+ mmsport="8080"
+ type="mms"
+ />
+
<apn carrier="TOT 3G Internet"
mcc="520"
mnc="15"
@@ -17507,7 +17637,7 @@
type="mms"
/>
- <apn carrier="TIM Connect"
+ <apn carrier="TIM CONNECT"
mcc="724"
mnc="02"
apn="timbrasil.br"
@@ -17517,10 +17647,10 @@
mmsproxy="200.179.66.242"
mmsport="8080"
authtype="1"
- type="default,supl,mms"
+ type="default,mms"
/>
- <apn carrier="TIM Connect"
+ <apn carrier="TIM CONNECT"
mcc="724"
mnc="03"
apn="timbrasil.br"
@@ -17530,10 +17660,10 @@
mmsproxy="200.179.66.242"
mmsport="8080"
authtype="1"
- type="default,supl,mms"
+ type="default,mms"
/>
- <apn carrier="TIM Connect"
+ <apn carrier="TIM CONNECT"
mcc="724"
mnc="04"
apn="timbrasil.br"
@@ -17543,7 +17673,7 @@
mmsproxy="200.179.66.242"
mmsport="8080"
authtype="1"
- type="default,supl,mms"
+ type="default,mms"
/>
<apn carrier="Java Session"
@@ -17552,8 +17682,8 @@
apn="java.claro.com.br"
user="claro"
password="claro"
- authtype="1"
- type="default,supl"
+ authtype="0"
+ type="default"
/>
<apn carrier="Claro Foto"
@@ -17579,6 +17709,7 @@
mmsproxy="200.142.130.104"
mmsport="80"
authtype="1"
+ protocol="IPV4V6"
type="mms"
/>
@@ -17589,7 +17720,8 @@
user="vivo"
password="vivo"
authtype="1"
- type="default,supl"
+ protocol="IPV4V6"
+ type="default"
/>
<apn carrier="SCTL MMS"
@@ -17620,7 +17752,9 @@
apn="zap.vivo.com.br"
user="vivo"
password="vivo"
- type="default,supl"
+ authtype="1"
+ protocol="IPV4V6"
+ type="default"
/>
<apn carrier="Vivo MMS"
@@ -17633,6 +17767,7 @@
mmsproxy="200.142.130.104"
mmsport="80"
authtype="1"
+ protocol="IPV4V6"
type="mms"
/>
@@ -17646,6 +17781,7 @@
mmsproxy="200.142.130.104"
mmsport="80"
authtype="1"
+ protocol="IPV4V6"
type="mms"
/>
@@ -17656,7 +17792,8 @@
user="vivo"
password="vivo"
authtype="1"
- type="default,supl"
+ protocol="IPV4V6"
+ type="default"
/>
@@ -17683,6 +17820,29 @@
type="mms"
/>
+ <apn carrier="Oi GPRS Internet"
+ mcc="724"
+ mnc="16"
+ apn="gprs.oi.com.br"
+ protocol="IPV4V6"
+ authtype="0"
+ type="default"
+ />
+
+ <apn carrier="MMS GPRS"
+ mcc="724"
+ mnc="16"
+ apn="mmsgprs.oi.com.br"
+ user="oimms"
+ password="oioioi"
+ mmsc="http://200.222.42.204:8002"
+ mmsproxy="192.168.10.50"
+ mmsport="3128"
+ authtype="1"
+ protocol="IPV4V6"
+ type="mms"
+ />
+
<apn carrier="TelemigC GPRS"
mcc="724"
mnc="19"
@@ -17711,10 +17871,10 @@
user="vivo"
password="vivo"
authtype="1"
- type="default,supl"
+ protocol="IPV4V6"
+ type="default"
/>
-
<apn carrier="Vivo MMS"
mcc="724"
mnc="23"
@@ -17725,6 +17885,7 @@
mmsproxy="200.142.130.104"
mmsport="80"
authtype="1"
+ protocol="IPV4V6"
type="mms"
/>
@@ -17751,27 +17912,61 @@
type="mms"
/>
- <apn carrier="OI GPRS"
+ <apn carrier="Oi GPRS Internet"
mcc="724"
mnc="31"
apn="gprs.oi.com.br"
- authtype="1"
- type="default,supl"
+ protocol="IPV4V6"
+ authtype="0"
+ type="default"
/>
- <apn carrier="OI MMS"
+ <apn carrier="MMS GPRS"
mcc="724"
mnc="31"
apn="mmsgprs.oi.com.br"
user="oimms"
- password="oimms"
+ password="oioioi"
mmsc="http://200.222.42.204:8002"
mmsproxy="192.168.10.50"
mmsport="3128"
authtype="1"
+ protocol="IPV4V6"
type="mms"
/>
+ <apn carrier='Nextel GPS'
+ mcc='724'
+ mnc='39'
+ apn='gps.nextel3g.net.br'
+ server='http://supl.nextel3g.net.br'
+ authtype='0'
+ type='supl'
+ protocol='IPV4V6'
+ roaming_protocol='IPV4V6'
+ />
+
+ <apn carrier='Nextel MMS'
+ mcc='724'
+ mnc='39'
+ apn='mms.nextel3g.net.br'
+ authtype='0'
+ mmsc='http://3gmms.nextel3g.net.br'
+ mmsproxy='129.192.129.104'
+ mmsport='8080'
+ type='mms'
+ />
+
+ <apn carrier='Nextel WAP'
+ mcc='724'
+ mnc='39'
+ apn='wap.nextel3g.net.br'
+ authtype='0'
+ type='default'
+ protocol='IPV4V6'
+ roaming_protocol='IPV4V6'
+ />
+
<apn carrier="Internet Movil"
mcc="730"
mnc="01"
diff --git a/camera/QCameraHWI_Still.cpp b/camera/QCameraHWI_Still.cpp
index 34d8765..d3fe706 100755
--- a/camera/QCameraHWI_Still.cpp
+++ b/camera/QCameraHWI_Still.cpp
@@ -2092,12 +2092,10 @@
if(mHalCamCtrl->mHdrMode == HDR_MODE) {
if ((hdrRawCount % 3) != 2) {
+ hdrRawCount++;
mStopCallbackLock.unlock();
return NO_ERROR;
}
- else {
- hdrRawCount++;
- }
}
if (rc != NO_ERROR)
diff --git a/device.mk b/device.mk
index 09d7ae2..e7d4da5 100644
--- a/device.mk
+++ b/device.mk
@@ -57,7 +57,8 @@
PRODUCT_COPY_FILES += \
device/lge/mako/WCNSS_cfg.dat:system/vendor/firmware/wlan/prima/WCNSS_cfg.dat \
device/lge/mako/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \
- device/lge/mako/WCNSS_qcom_wlan_nv.bin:system/etc/wifi/WCNSS_qcom_wlan_nv.bin
+ device/lge/mako/WCNSS_qcom_wlan_nv.bin:system/etc/wifi/WCNSS_qcom_wlan_nv.bin \
+ device/lge/mako/init.mako.wifi.sh:system/etc/init.mako.wifi.sh
PRODUCT_COPY_FILES += \
device/lge/mako/audio_policy.conf:system/etc/audio_policy.conf
diff --git a/init.mako.rc b/init.mako.rc
index 0e430db..40b81a1 100644
--- a/init.mako.rc
+++ b/init.mako.rc
@@ -147,16 +147,12 @@
# to observe dnsmasq.leases file for dhcp information of soft ap.
chown dhcp system /data/misc/dhcp
- write /dev/wcnss_wlan 1
+ chown system system /dev/wcnss_wlan
write /sys/module/wcnss_ssr_8960/parameters/enable_riva_ssr 1
# Create directory used by audio subsystem
mkdir /data/misc/audio 0770 audio audio
- # Workaround for conn_init not copying the updated firmware
- rm /data/misc/wifi/WCNSS_qcom_cfg.ini
- rm /data/misc/wifi/WCNSS_qcom_wlan_nv.bin
-
# Mounting of persist is moved to 'on emmc-fs' and 'on fs' sections
# We chown/chmod /persist again so because mount is run as root + defaults
chown system system /persist
@@ -236,6 +232,9 @@
write /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq 384000
write /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq 384000
+ # disable diag port
+ rm /dev/diag
+
on charger
# Enable Power modes and set the CPU Freq Sampling rates
write /sys/module/rpm_resources/enable_low_power/L2_cache 1
@@ -396,10 +395,11 @@
user camera
group camera system inet input
-service conn_init /system/bin/conn_init
+service wcnss_init /system/bin/sh /system/etc/init.mako.wifi.sh
class late_start
user system
group system wifi
+ seclabel u:r:conn_init:s0
oneshot
service bdAddrLoader /system/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x
diff --git a/init.mako.wifi.sh b/init.mako.wifi.sh
new file mode 100644
index 0000000..e586e96
--- /dev/null
+++ b/init.mako.wifi.sh
@@ -0,0 +1,10 @@
+#!/system/bin/sh
+
+# Workaround for conn_init not copying the updated firmware
+rm /data/misc/wifi/WCNSS_qcom_cfg.ini
+rm /data/misc/wifi/WCNSS_qcom_wlan_nv.bin
+
+/system/bin/conn_init
+
+echo 1 > /dev/wcnss_wlan
+
diff --git a/overlay/frameworks/base/core/res/res/values-mcc530-mnc05/config.xml b/overlay/frameworks/base/core/res/res/values-mcc530-mnc05/config.xml
new file mode 100644
index 0000000..3dfbe0e
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values-mcc530-mnc05/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+<resources>
+ <!-- If this value is true, The mms content-disposition field is supported correctly.
+ If false, Content-disposition fragments are ignored -->
+ <bool name="config_mms_content_disposition_support">false</bool>
+</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc39/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc39/config.xml
new file mode 100644
index 0000000..c200847
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values-mcc724-mnc39/config.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You my obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
+ <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
+ <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
+ <integer-array translatable="false" name="config_tether_upstream_types">
+ <item>1</item>
+ <item>4</item>
+ <item>7</item>
+ <item>9</item>
+ </integer-array>
+
+ <!-- String containing the apn value for tethering. May be overriden by secure settings
+ TETHER_DUN_APN. Value is a comma separated series of strings:
+ "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
+ note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
+ <string-array translatable="false" name="config_tether_apndata">
+ <item>Nextel Modem,modem.nextel3g.net.br,,,,,,,,,724,39,0,DUN</item>
+ </string-array>
+</resources>
diff --git a/sepolicy/conn_init.te b/sepolicy/conn_init.te
index 33f0cab..6491888 100644
--- a/sepolicy/conn_init.te
+++ b/sepolicy/conn_init.te
@@ -2,10 +2,11 @@
type conn_init, domain;
type conn_init_exec, exec_type, file_type;
-# Started by logwrapper in init
-domain_auto_trans(init, conn_init_exec, conn_init)
+init_daemon_domain(conn_init)
-allow conn_init devpts:chr_file { read write };
+# Runs init.mako.wifi.sh
+allow conn_init shell_exec:file { entrypoint read };
+allow conn_init conn_init_exec:file rx_file_perms;
# Allow /persist/wifi access
allow conn_init { persist_file persist_wifi_file }:dir search;
@@ -14,3 +15,8 @@
# Allow /data/misc/wifi access for firmware files
allow conn_init wifi_data_file:dir w_dir_perms;
allow conn_init wifi_data_file:file create_file_perms;
+
+allow conn_init wlan_device:chr_file rw_file_perms;
+
+# init.mako.wifi.sh runs toolbox
+allow conn_init system_file:file execute_no_trans;
diff --git a/sepolicy/device.te b/sepolicy/device.te
index 81caeca..b6e993a 100644
--- a/sepolicy/device.te
+++ b/sepolicy/device.te
@@ -1,3 +1,5 @@
+type wlan_device, dev_type;
+
type diag_device, dev_type;
# Kickstart device used by QC qcks
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index a44c8b1..7805255 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -2,6 +2,9 @@
/dev/kgsl-3d0 u:object_r:gpu_device:s0
/dev/kgsl u:object_r:gpu_device:s0
+# WLAN
+/dev/wcnss_wlan u:object_r:wlan_device:s0
+
# Image Rotator Driver
/dev/msm_rotator u:object_r:video_device:s0
