Merge "Remove incorrect carrier config values"
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index d6bbbd2..72c1eb5 100755
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -740,10 +740,10 @@
type="mms"
/>
- <apn carrier="Px MMS"
+ <apn carrier="Proximus MMS"
mcc="206"
mnc="01"
- apn="EVENT.PROXIMUS.BE"
+ apn="event.proximus.be"
user="mms"
password="mms"
authtype="1"
@@ -753,17 +753,17 @@
type="mms"
/>
- <apn carrier="Px Internet"
+ <apn carrier="Proximus Internet"
mcc="206"
mnc="01"
apn=""
type="ia"
/>
- <apn carrier="Px Internet"
+ <apn carrier="Proximus Internet"
mcc="206"
mnc="01"
- apn="INTERNET.PROXIMUS.BE"
+ apn="internet.proximus.be"
type="default,supl"
/>
@@ -772,7 +772,7 @@
mnc="01"
apn="telenetwap.be"
type="default,supl"
- mvno_match_data="2060188"
+ mvno_match_data="20601889"
mvno_type="imsi"
/>
@@ -784,7 +784,7 @@
mmsproxy="195.130.149.100"
mmsport="80"
type="mms"
- mvno_match_data="2060188"
+ mvno_match_data="20601889"
mvno_type="imsi"
/>
@@ -1008,7 +1008,6 @@
apn="orange"
user="orange"
password="orange"
- authtype="1"
type="default,supl"
/>
@@ -1021,11 +1020,10 @@
mmsc="http://mms.orange.fr"
mmsproxy="192.168.10.200"
mmsport="8080"
- authtype="1"
type="mms"
/>
- <apn carrier="Orange Entreprise"
+ <apn carrier="Orange Entreprises"
mcc="208"
mnc="01"
apn="orange-mib"
@@ -1033,15 +1031,14 @@
port="8000"
user="orange"
password="orange"
- authtype="2"
- type="default"
+ type="default,supl"
/>
<apn carrier="Orange Internet"
mcc="208"
mnc="01"
apn="orange.fr"
- authtype="0"
+ authtype="1"
user="orange"
password="orange"
type="dun"
@@ -1163,7 +1160,7 @@
mmsc="http://mms1"
mmsproxy="10.151.0.1"
mmsport="8080"
- type="default,mms,supl"
+ type="default,hipri,mms"
/>
<apn carrier="SFR option Modem"
diff --git a/device.mk b/device.mk
index 0dc290c..e23a159 100644
--- a/device.mk
+++ b/device.mk
@@ -565,6 +565,17 @@
$(call add-product-dex-preopt-module-config,wifi-service,--generate-mini-debug-info)
endif
+# Get rid of dex preoptimization to save space within system.img at the one
+# time cost of dexing on first boot. This list can be found by running:
+# grep odex $ANDROID_PRODUCT_OUT/installed-files.txt
+# Sorted by *.odex size
+ANGLER_DONT_DEXPREOPT_MODULES := \
+ BetterBug \
+ GoogleHindiIME \
+ CloudPrint2
+
+$(call add-product-dex-preopt-module-config,$(ANGLER_DONT_DEXPREOPT_MODULES),disable)
+
# setup dalvik vm configs.
$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
diff --git a/init.angler.usb.rc b/init.angler.usb.rc
index f2edba9..b4193af 100644
--- a/init.angler.usb.rc
+++ b/init.angler.usb.rc
@@ -23,10 +23,15 @@
write /sys/class/android_usb/android0/iProduct ${ro.product.model}
on post-fs
- mkdir /dev/usb-ffs 0770 shell shell
+ mkdir /dev/usb-ffs 0775 shell shell
mkdir /dev/usb-ffs/adb 0770 shell shell
mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
- write /sys/class/android_usb/android0/f_ffs/aliases adb
+ mkdir /dev/usb-ffs/mtp 0770 mtp mtp
+ mount functionfs mtp /dev/usb-ffs/mtp rmode=0770,fmode=0660,uid=1024,gid=1024
+ write /sys/class/android_usb/android0/f_ffs/aliases adb,mtp
+ setprop sys.usb.ffs.max_write 262144
+ setprop sys.usb.ffs.max_read 262144
+ setprop sys.usb.mtp.device_type 3
on charger
setprop persist.sys.usb.config charging
@@ -90,7 +95,7 @@
write /sys/class/android_usb/android0/bDeviceClass 0
write /sys/class/android_usb/android0/bDeviceSubClass 0
write /sys/class/android_usb/android0/bDeviceProtocol 0
- write /sys/class/android_usb/android0/functions ptp
+ write /sys/class/android_usb/android0/functions mtp
write /sys/class/android_usb/android0/enable 1
setprop sys.usb.state ${sys.usb.config}
@@ -101,7 +106,7 @@
write /sys/class/android_usb/android0/bDeviceClass 0
write /sys/class/android_usb/android0/bDeviceSubClass 0
write /sys/class/android_usb/android0/bDeviceProtocol 0
- write /sys/class/android_usb/android0/functions ptp,adb
+ write /sys/class/android_usb/android0/functions mtp,adb
write /sys/class/android_usb/android0/enable 1
start adbd
setprop sys.usb.state ${sys.usb.config}
diff --git a/sepolicy/hal_dumpstate_impl.te b/sepolicy/hal_dumpstate_impl.te
index e8e098d..ee2e3ab 100644
--- a/sepolicy/hal_dumpstate_impl.te
+++ b/sepolicy/hal_dumpstate_impl.te
@@ -1,6 +1,7 @@
-type hal_dumpstate_impl, domain, hal_dumpstate;
-type hal_dumpstate_impl_exec, exec_type, file_type;
+type hal_dumpstate_impl, domain;
+hal_impl_domain(hal_dumpstate_impl, hal_dumpstate)
+type hal_dumpstate_impl_exec, exec_type, file_type;
init_daemon_domain(hal_dumpstate_impl)
# Access to files for dumping
