Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_vendor_cm into replicant-6.0

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

Conflicts:
	overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg
	overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg
	overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg
	overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg

11 files changed, 68 insertions, 13 deletions

diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index 81eb1a3..4c67709 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -16,16 +16,21 @@ Maintainers (CyanogenMod 13.0):
 * __Asus EeePad Transformer Pad TF300T:__  chrmhoffmann
 * __Asus EeePad Transformer Pad Infinity TF700T:__ dasunsrule32
 * __Asus EeePad Transformer Pad TF701T:__ pershoot
+* __Asus Zenfone 2 ZE550ML (Z008):__ crpalmer, jrior001
+* __Asus Zenfone 2 ZE551ML (Z00A):__ crpalmer, jrior001
 * __B&N NookColor (encore):__ eyeballer, fattire, keyodi, krylon360, sluo (NookieDevs)
 * __B&N Nook Tablet (acclaim):__  chrmhoffmann
 * __Google Android One:__ varunchitre15
 * __Google Galaxy Nexus:__ bekit, Bumble-Bee, burnsra, KalimochoAz, something15525
 * __Google Nexus S:__ burnsra, KalimochoAz, klusark
-* __Google Nexus 4:__ rmcc
-* __Google Nexus 5:__ fluxi
+* __Google Nexus 4:__ ciwrl
+* __Google Nexus 5:__ ciwrl
+* __Google Nexus 5X:__ ciwrl, jakew02
 * __Google Nexus 6:__ dhacker29
+* __Google Nexus 6P:__ ciwrl, dhacker29, Sam Mortimer
 * __Google Nexus 7:__ burnsra, fattire, Thömy, nemith, JoeyRizzoli (GSM)
-* __Google Nexus 10:__ atinm, dalingrin, kornyone, gweedo767
+* __Google Nexus 9:__ simonsickle, ciwrl
+* __Google Nexus 10:__ Tortel, ciwrl
 * __Google Nexus Player:__ dhacker29, bmc08gt
 * __HTC Desire 601(zara/zaracl):__ uberlaggydarwin, PatrikKT
 * __HTC Desire 816:__ Grarak, v_superuser
@@ -37,13 +42,13 @@ Maintainers (CyanogenMod 13.0):
 * __HTC One M8:__ deck, h8rift, invisblek, toastcfh, u-ra, uberlaggydarwin
 * __HTC One M8 Dual SIM (m8dug):__ bgcngm
 * __HTC One M9 (hima):__ cyanogen, Rashed97, varunchitre15
-* __HTC One Max (T6):__ flyhalf205, sbrissen
+* __HTC One Max (T6):__ Flyhalf205
 * __HTC One (Sprint):__ kushdeck, toastcfh
 * __HTC One (Verizon):__ flyhalf205, mdmower
 * __HTC One S:__ intervigil, xkonni
 * __HTC One X:__ gorbi16, mdeejay, tbalden, Thömy
 * __HTC One X+:__ Lloir, tombriden
-* __HTC One XL:__ h8rift, intervigil
+* __HTC One XL:__ h8rift, intervigil, jrior001
 * __LG G2 (AT&T) (D800):__ arcee, Rashed97, Shelnutt2
 * __LG G2 (T-Mobile) (D801):__ arcee, Rashed97, Shelnutt2
 * __LG G2 (International) (D802):__ arcee, Rashed97, Shelnutt2
@@ -87,7 +92,7 @@ Maintainers (CyanogenMod 13.0):
 * __Oppo Find 5:__ intervigil, nebkat, raymanfx
 * __Oppo Find 7:__ intervigil, tdm, inwotep, mikeioannina
 * __Oppo N1:__ raymanfx
-* __Oppo N3:__ invisiblek, maniac103
+* __Oppo N3:__ jrior001
 * __Oppo R7:__ maniac103, mikeioannina, Rashed97
 * __Oppo R7 Plus:__ maniac103, mikeioannina, Rashed97
 * __Samsung Captivate (SGH-I896 / SGH-I897):__ pawitp
@@ -131,6 +136,7 @@ Maintainers (CyanogenMod 13.0):
 * __Samsung Galaxy S IV Mini LTE (GT-I9195):__ arco
 * __Samsung Galaxy S V (AU) (SCL23):__ scoty755
 * __Samsung Galaxy S V (Vodafone) (SM-G900I):__ Regi24
+* __Samsung Galaxy S V LTE (SM-G900F):__ Albinoman887
 * __Samsung Galaxy Tab 7" (GSM):__ cdesai, humberos
 * __Samsung Galaxy Tab 7" (CDMA):__ jt1134
 * __Samsung Galaxy Tab 2 7" (GT-P31xx):__ codyf86
@@ -141,7 +147,7 @@ Maintainers (CyanogenMod 13.0):
 * __Sony Xperia L (taoshan):__ olivieer, FreeXperia Team
 * __Sony Xperia M (nicki):__ RonG, FreeXperia Team
 * __Sony Xperia M2 (eagle):__ FreeXperia Team
-* __Sony Xperia SP (huashan):__ Mrcl1450
+* __Sony Xperia SP (huashan):__ AdrianDC
 * __Sony Xperia T (mint):__ FreeXperia Team, tilal6991, uberlaggydarwin
 * __Sony Xperia T2 Ultra  (tianchi):__ FreeXperia Team
 * __Sony Xperia T3  (seagull):__ FreeXperia Team
diff --git a/build/core/maven_artifact.mk b/build/core/maven_artifact.mk
index 08491d2..3f8e7fd 100644
--- a/build/core/maven_artifact.mk
+++ b/build/core/maven_artifact.mk
@@ -50,7 +50,20 @@ $(LOCAL_PREBUILT_MODULE_FILE):
 		-DoutputDirectory=$(dir $@)
 	@echo -e ${CL_GRN}"Download:"${CL_RST}" $@"
 
+ifneq ($(filter-out disabled, $(LOCAL_JACK_ENABLED)),)
+ifneq ($(LOCAL_MAVEN_PACKAGING),apk)
+# This is required to be defined before the LOCAL_MODULES target below gets defined, it's a NOOP registered again in
+# BUILD_PREBUILT.  This is done because BUILD_PREBUILT doesn't actually handle generating the .jack files properly and
+# only generates a target but doesn't set the LOCAL_MODULE dependent on it.
+$(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON):
+
+# This adds another step required for LOCAL_MODULE to be completed -- generating the jack file, it just so happens
+# to be built when doing a brunch, but not when doing an mmm, so this makes it work with both
+$(LOCAL_MODULE): $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON)/classes.jack
+endif # LOCAL_MAVEN_PACKING is not apk
+endif # LOCAL_JACK_ENABLED is full or partial
+
 include $(BUILD_PREBUILT)
 
 # the "fetchprebuilts" target will go through and pre-download all of the maven dependencies in the tree
-fetchprebuilts: $(LOCAL_PREBUILT_MODULE_FILE)
\ No newline at end of file
+fetchprebuilts: $(LOCAL_PREBUILT_MODULE_FILE)
diff --git a/config/common.mk b/config/common.mk
index e2849a8..c993e64 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -125,6 +125,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     vendor/replicant/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml
 
+# Live lockscreen
+PRODUCT_COPY_FILES += \
+    vendor/cm/config/permissions/org.cyanogenmod.livelockscreen.xml:system/etc/permissions/org.cyanogenmod.livelockscreen.xml
+
 # Theme engine
 include vendor/replicant/config/themes_common.mk
 
@@ -283,7 +287,7 @@ ifndef CM_PLATFORM_SDK_VERSION
   # the SDK are released.  It should only be incremented when the APIs for
   # the new release are frozen (so that developers don't write apps against
   # intermediate builds).
-  CM_PLATFORM_SDK_VERSION := 4
+  CM_PLATFORM_SDK_VERSION := 5
 endif
 
 ifndef CM_PLATFORM_REV
diff --git a/config/permissions/org.cyanogenmod.livelockscreen.xml b/config/permissions/org.cyanogenmod.livelockscreen.xml
new file mode 100644
index 0000000..1d09d4f
--- /dev/null
+++ b/config/permissions/org.cyanogenmod.livelockscreen.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The CyanogenMod 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.
+-->
+
+<permissions>
+    <feature name="org.cyanogenmod.livelockscreen" />
+</permissions>
+
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg
new file mode 100644
index 0000000..aab9812
--- /dev/null
+++ b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg
index 90f40b4..ef645fe 100644
--- a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg
+++ b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg
new file mode 100644
index 0000000..1e56ad8
--- /dev/null
+++ b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index b8e659e..753257d 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -1460,7 +1460,6 @@
   <apn carrier="USCC" mcc="310" mnc="120" apn="internet" proxy="" port="80" user="" password="" mmsc="http://mmsc1.uscc.net/mmsc/MMS" mmsproxy="" mmsport="80" authtype="3" type="mms" />
   <apn carrier="My Multi Media" mcc="310" mnc="130" apn="mms.c1.ama" proxy="" port="" user="cell1mms" password="cell1" mmsc="http://mms.iot1.com/amarillo/mms.php" type="mms" />
   <apn carrier="Cricket" mcc="310" mnc="16" apn="wap.mycricket.com" user="@mycricket.com" password="cricket" mmsc="http://mms.mycricket.com/servlets/mms" proxy="wap.mycricket.com" port="8080" authtype="2" type="*" />
-  <apn carrier="Internet" mcc="310" mnc="150" apn="ndo" port="" mmsc="http://mmsc.aiowireless.net" mmsproxy="proxy.aiowireless.net" mmsport="80" type="default,mms,fota,hipri,supl" />
   <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,hipri,supl" />
   <apn carrier="ATT WAP" mcc="310" mnc="170" apn="wap.cingular" proxy="wireless.cingular.com" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="wireless.cingular.com" mmsport="80" type="default,mms" />
   <apn carrier="ATT Broadband" mcc="310" mnc="170" apn="Broadband" type="default,supl" />
@@ -1471,9 +1470,9 @@
   <apn carrier="WCW Internet" mcc="310" mnc="180" apn="internet.wcc.net" user="3257630000" password="mmsc" type="default,supl" authtype="0" />
   <apn carrier="WCW-MMS" mcc="310" mnc="180" apn="mms.wcc.net" proxy="209.55.70.246" port="80" mmsc="http://mms.wcc.net" mmsproxy="209.55.70.246" mmsport="80" user="13257630000" password="mmsc" type="mms" authtype="3" />
   <apn carrier="WCW-MMS only" mcc="310" mnc="180" apn="mms.wcc.net" proxy="209.55.70.244" port="80" mmsc="http://mms.wcc.net" mmsproxy="209.55.70.246" mmsport="80" user="3257630000" password="mmsc" type="default,mms" authtype="3" />
-  <apn carrier="T-Mobile US LTE" mcc="310" mnc="260" apn="" type="ia" protocol="IPV4V6" mtu="1440" />
-  <apn carrier="T-Mobile US LTE" mcc="310" mnc="260" apn="fast.t-mobile.com" type="default,supl" protocol="IPV6" roaming_protocol="IP" mtu="1440" />
-  <apn carrier="T-Mobile MMS" mcc="310" mnc="260" apn="TMUS" mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc" type="mms" protocol="IPV6" roaming_protocol="IP" />
+  <apn carrier="T-Mobile US LTE" mcc="310" mnc="260" apn="fast.t-mobile.com" type="ia" protocol="IPV4V6" mtu="1440" />
+  <apn carrier="T-Mobile US LTE" mcc="310" mnc="260" apn="fast.t-mobile.com" type="default,supl" protocol="IPV4V6" roaming_protocol="IP" mtu="1440" />
+  <apn carrier="T-Mobile MMS" mcc="310" mnc="260" apn="TMUS" mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc" type="mms" protocol="IPV4V6" roaming_protocol="IP" />
   <apn carrier="Project Fi - T" mcc="310" mnc="260" apn="h2g2" type="ia" protocol="IPV4V6" roaming_protocol="IPV4V6" mvno_match_data="31026097" mvno_type="IMSI" />
   <apn carrier="Project Fi - T" mcc="310" mnc="260" apn="h2g2" user="none" server="*" password="none" mmsc="http://mmsc1.g-mms.com/mms/wapenc" protocol="IPV6" roaming_protocol="IP" mvno_match_data="31026097" mvno_type="IMSI" />
   <apn carrier="T-Mobile IMS" mcc="310" mnc="260" apn="ims" type="ims" protocol="IPV6" />
diff --git a/sepolicy/app.te b/sepolicy/app.te
index 761eb5f..e590efe 100644
--- a/sepolicy/app.te
+++ b/sepolicy/app.te
@@ -1,3 +1,8 @@
+# Access OBBs (sdcard_posix) mounted by vold
+# File write access allowed for FDs returned through Storage Access Framework
+allow appdomain sdcard_posix:dir r_dir_perms;
+allow appdomain sdcard_posix:file rw_file_perms;
+
 # Themed resources (i.e. composed icons)
 allow appdomain theme_data_file:dir r_dir_perms;
 allow appdomain theme_data_file:file r_file_perms;
diff --git a/sepolicy/platform_app.te b/sepolicy/platform_app.te
new file mode 100644
index 0000000..db8647d
--- /dev/null
+++ b/sepolicy/platform_app.te
@@ -0,0 +1,4 @@
+# Direct access to vold-mounted storage under /mnt/media_rw
+# This is a performance optimization that allows platform apps to bypass the FUSE layer
+allow platform_app sdcard_posix:dir create_dir_perms;
+allow platform_app sdcard_posix:file create_file_perms;
diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te
index e2efee4..76e7a62 100644
--- a/sepolicy/recovery.te
+++ b/sepolicy/recovery.te
@@ -30,6 +30,10 @@ allow recovery sdcard_posix:file r_file_perms;
 allow recovery recovery_prop:property_service set;
 
 # recursive rm for wipes... :(
+allow app_data_file self:filesystem associate;
+allow recovery app_data_file:file { read open create write };
+allow recovery app_data_file:filesystem { relabelto relabelfrom mount unmount };
+
 allow recovery file_type:dir { rw_dir_perms rmdir };
 allow recovery file_type:notdevfile_class_set { unlink getattr };
 # wipe saves and restores the layout version