Merge "Revert "Revert "angler: update wifi nvram for Korea""" into mnc-dr-dev
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 9badee5..aa1af2d 100755
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -1130,27 +1130,6 @@
mvno_type="gid"
/>
- <apn carrier="Tele2 WAP"
- mcc="208"
- mnc="01"
- apn="ofnew.fr"
- user="orange"
- password="orange"
- type="default,supl"
- />
-
- <apn carrier="Tele2 MMS"
- mcc="208"
- mnc="01"
- apn="orange.acte"
- user="orange"
- password="orange"
- mmsc="http://mms.orange.fr"
- mmsproxy="192.168.10.200"
- mmsport="8080"
- type="mms"
- />
-
<apn carrier="SFR webphone"
mcc="208"
mnc="09"
@@ -3463,6 +3442,17 @@
authtype="0"
type="default,supl"
/>
+
+ <apn carrier="Simyo Internet"
+ mcc="214"
+ mnc="19"
+ apn="gprs-service.com"
+ mmsc="http://217.18.32.180:8080"
+ mmsproxy="217.18.32.181"
+ mmsport="8080"
+ type="default,supl,mms"
+ />
+
<apn carrier="UBIQUISYS"
mcc="234"
mnc="01"
@@ -25010,6 +25000,7 @@
mcc="440"
mnc="10"
apn="3g-d-2.ocn.ne.jp"
+ type="default,supl"
user="mobileid@ocn"
server=""
password="mobile"
@@ -25020,6 +25011,7 @@
mcc="440"
mnc="10"
apn="lte-d.ocn.ne.jp"
+ type="default,supl"
user="mobileid@ocn"
server=""
password="mobile"
@@ -25171,6 +25163,7 @@
mcc="450"
mnc="05"
apn="lte-roaming.sktelecom.com"
+ type="default,mms,supl,fota,cbs"
mmsc="http://omms.nate.com:9082/oma_mms"
mmsproxy="smart.nate.com"
mmsport="9093"
@@ -25181,6 +25174,7 @@
mcc="450"
mnc="05"
apn="roaming.sktelecom.com"
+ type="default,mms,supl,fota,cbs"
mmsc="http://omms.nate.com:9082/oma_mms"
mmsproxy="smart.nate.com"
mmsport="9093"
@@ -25202,6 +25196,7 @@
mcc="450"
mnc="11"
apn="lte-roaming.sktelecom.com"
+ type="default,mms,supl,fota,cbs"
mmsc="http://omms.nate.com:9082/oma_mms"
mmsproxy="smart.nate.com"
mmsport="9093"
@@ -25212,12 +25207,23 @@
mcc="450"
mnc="11"
apn="roaming.sktelecom.com"
+ type="default,mms,supl,fota,cbs"
mmsc="http://omms.nate.com:9082/oma_mms"
mmsproxy="smart.nate.com"
mmsport="9093"
server="*"
/>
+ <apn carrier="tplus"
+ mcc="450"
+ mnc="11"
+ apn="lte.sktelecom.com"
+ type="default,supl,mms,dun"
+ mmsc="http://omms.nate.com:9082/oma_mms"
+ mmsproxy="smart.nate.com"
+ mmsport="9093"
+ />
+
<apn carrier="LG uplus IA"
mcc="450"
mnc="06"
@@ -25249,6 +25255,7 @@
mcc="450"
mnc="06"
apn="lte-roaming.lguplus.co.kr"
+ type="default,mms,supl,fota,cbs"
mmsc="http://omammsc.uplus.co.kr:9084"
authtype="0"
/>
@@ -25257,6 +25264,7 @@
mcc="450"
mnc="06"
apn="wroaming.lguplus.co.kr"
+ type="default,mms,supl,fota,cbs"
mmsc="http://omammsc.uplus.co.kr:9084"
authtype="0"
/>
@@ -26197,6 +26205,17 @@
mvno_type="spn"
/>
+ <apn carrier="GT Roaming"
+ mcc="525"
+ mnc="05"
+ apn="gtnet"
+ mvno_type="imsi"
+ mvno_match_data="525053095"
+ type="default,supl"
+ roaming_protocol="IPV4V6"
+ protocol="IPV4V6"
+ />
+
<apn carrier="和信電訊(KGT-Online) (Internet)"
mcc="466"
mnc="88"
diff --git a/init.angler.rc b/init.angler.rc
index 6ac92c2..66fcc31 100755
--- a/init.angler.rc
+++ b/init.angler.rc
@@ -221,7 +221,7 @@
write /sys/module/lpm_levels/parameters/sleep_disabled 0
# Search the laser device under /dev/input, then create symlink
-service InputEventFind /system/bin/InputEventFind
+service InputEventFind /vendor/bin/InputEventFind
class main
oneshot
@@ -298,7 +298,7 @@
service netmgrd /system/bin/netmgrd
class main
- group radio
+ group radio system
service qti /system/vendor/bin/qti
class main
diff --git a/sepolicy/cnd.te b/sepolicy/cnd.te
index d1b1035..d98bcd2 100644
--- a/sepolicy/cnd.te
+++ b/sepolicy/cnd.te
@@ -17,3 +17,4 @@
allow cnd sysfs_msm_subsys:lnk_file rw_file_perms;
qmux_socket(cnd)
+wakelock_use(cnd)
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 32d2637..21f0ea3 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -114,7 +114,6 @@
/system/bin/ims_rtp_daemon u:object_r:ims_exec:s0
/system/bin/init\.angler\.power\.sh u:object_r:init-power-sh_exec:s0
/system/bin/init\.mcfg\.sh u:object_r:init-mcfg-sh_exec:s0
-/system/bin/InputEventFind u:object_r:inputeventfind_exec:s0
/system/bin/irsc_util u:object_r:irsc_util_exec:s0
/system/bin/loc_launcher u:object_r:location_exec:s0
/system/bin/location-mq u:object_r:location_exec:s0
@@ -134,6 +133,7 @@
/system/bin/thermal-engine u:object_r:thermald_exec:s0
/system/bin/time_daemon u:object_r:time_exec:s0
/vendor/bin/diag_test_server u:object_r:diag_exec:s0
+/vendor/bin/InputEventFind u:object_r:inputeventfind_exec:s0
/vendor/bin/oem_qmi_server u:object_r:oem_qmi_server_exec:s0
/vendor/bin/qti u:object_r:qti_exec:s0
/vendor/bin/sensortool\.angler u:object_r:sensortool_exec:s0
