diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index c475537b..b05e3ebd 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -43,6 +43,7 @@ Maintainers (CyanogenMod 12.0):
* __LG G3 (Verizon) (VS985):__ invisiblek
* __LG Optimus LTE (P930) / LG Nitro HD {P935):__ arcee
* __LG Optimus LTE (SK Telecom) (SU640):__ arcee
+* __Moto E 2014 (xt1021,xt1022,xt1023/condor):__ percy_g2, scritch007
* __Moto G 4G (xt1039,xt1040,xt1042,xt1045/peregrine):__ somcom3x, intervigil
* __Moto X (xt1053,xt1055,xt1056,xt1058,xt1060/ghost):__ Hashcode, Skrilax_CZ
* __Moto X 2014 (victara):__ crpalmer
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index f35bd586..de2067a0 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -4,7 +4,7 @@ $(call inherit-product, vendor/cm/config/common_full.mk)
# Default notification/alarm sounds
PRODUCT_PROPERTY_OVERRIDES += \
ro.config.notification_sound=Argon.ogg \
- ro.config.alarm_alert=Hassium.ogg
+ ro.config.alarm_alert=Helium.ogg
ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
PRODUCT_COPY_FILES += \
diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk
index fa0080d4..f7689b7e 100644
--- a/config/common_full_tablet_wifionly.mk
+++ b/config/common_full_tablet_wifionly.mk
@@ -4,7 +4,7 @@ $(call inherit-product, vendor/cm/config/common_full.mk)
# Default notification/alarm sounds
PRODUCT_PROPERTY_OVERRIDES += \
ro.config.notification_sound=Argon.ogg \
- ro.config.alarm_alert=Hassium.ogg
+ ro.config.alarm_alert=Helium.ogg
ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
PRODUCT_COPY_FILES += \
diff --git a/config/common_mini_phone.mk b/config/common_mini_phone.mk
index 4b193060..956bb380 100644
--- a/config/common_mini_phone.mk
+++ b/config/common_mini_phone.mk
@@ -7,7 +7,7 @@ include vendor/cm/config/cm_audio.mk
# Default notification/alarm sounds
PRODUCT_PROPERTY_OVERRIDES += \
ro.config.notification_sound=Argon.ogg \
- ro.config.alarm_alert=Hassium.ogg
+ ro.config.alarm_alert=Helium.ogg
ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
PRODUCT_COPY_FILES += \
diff --git a/config/common_mini_tablet_wifionly.mk b/config/common_mini_tablet_wifionly.mk
index 882af7e5..57256ed4 100644
--- a/config/common_mini_tablet_wifionly.mk
+++ b/config/common_mini_tablet_wifionly.mk
@@ -7,7 +7,7 @@ include vendor/cm/config/cm_audio.mk
# Default notification/alarm sounds
PRODUCT_PROPERTY_OVERRIDES += \
ro.config.notification_sound=Argon.ogg \
- ro.config.alarm_alert=Hassium.ogg
+ ro.config.alarm_alert=Helium.ogg
ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
PRODUCT_COPY_FILES += \
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index a2378443..1d92819f 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -27,12 +27,18 @@
- com.google.android.gsf/com.google.android.gsf.update.SystemUpdateActivity
- - com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService
- com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService$Receiver
+ - com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService$SecretCodeReceiver
- com.google.android.gms/com.google.android.gms.update.SystemUpdateActivity
- - com.google.android.gms/com.google.android.gms.update.SystemUpdateService
- com.google.android.gms/com.google.android.gms.update.SystemUpdateService$Receiver
- com.google.android.gms/com.google.android.gms.update.SystemUpdateService$ActiveReceiver
+ - com.google.android.gms/com.google.android.gms.update.SystemUpdateService$SecretCodeReceiver
+
+
+
+
+ - com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService
+ - com.google.android.gms/com.google.android.gms.update.SystemUpdateService
CyanogenMod
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 1e291070..da60f426 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -147,10 +147,10 @@
-
-
-
-
+
+
+
+
@@ -709,6 +709,7 @@
+
@@ -777,7 +778,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -807,6 +837,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -856,17 +916,17 @@
-
+
-
+
-
+
@@ -874,7 +934,7 @@
-
+
@@ -890,7 +950,7 @@
-
+
@@ -918,7 +978,7 @@
-
+
@@ -934,7 +994,7 @@
-
+
@@ -947,12 +1007,12 @@
-
+
-
+
@@ -979,7 +1039,7 @@
-
+
@@ -995,7 +1055,7 @@
-
+
@@ -1036,30 +1096,30 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1166,22 +1226,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1434,6 +1494,7 @@
+
@@ -1553,6 +1614,7 @@
+
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 7999ccd9..4f82c380 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -12,6 +12,7 @@
/system/bin/sysinit u:object_r:sysinit_exec:s0
/system/etc/init.d/90userinit u:object_r:userinit_exec:s0
+/data/local/userinit.sh u:object_r:userinit_data_exec:s0
# For minivold in recovery
/sbin/minivold u:object_r:vold_exec:s0
diff --git a/sepolicy/sysinit.te b/sepolicy/sysinit.te
index dea539e8..6fd0b856 100644
--- a/sepolicy/sysinit.te
+++ b/sepolicy/sysinit.te
@@ -9,3 +9,13 @@ allow sysinit shell_exec:file { rx_file_perms };
allow sysinit system_file:file { rx_file_perms };
allow sysinit self:process setcurrent;
+userdebug_or_eng(`
+ allow sysinit userinit_data_exec:file { r_file_perms relabelto };
+ allow sysinit property_socket:sock_file write;
+ allow sysinit init:unix_stream_socket connectto;
+ allow sysinit userinit_prop:property_service set;
+ allow sysinit sysfs:file rw_file_perms;
+ allow sysinit sysfs_devices_system_cpu:file write;
+ allow sysinit self:capability dac_override;
+ allow sysinit userinit_exec:file { rx_file_perms };
+')
diff --git a/sepolicy/userinit.te b/sepolicy/userinit.te
index caddb086..74072877 100644
--- a/sepolicy/userinit.te
+++ b/sepolicy/userinit.te
@@ -1,3 +1,4 @@
type userinit_exec, exec_type, file_type;
+type userinit_data_exec, file_type;
allow userinit_exec userinit_prop:property_service set;