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

17 files changed, 361 insertions, 134 deletions

diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index 4c67709..b7ff733 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -18,6 +18,8 @@ Maintainers (CyanogenMod 13.0):
 * __Asus EeePad Transformer Pad TF701T:__ pershoot
 * __Asus Zenfone 2 ZE550ML (Z008):__ crpalmer, jrior001
 * __Asus Zenfone 2 ZE551ML (Z00A):__ crpalmer, jrior001
+* __Asus Zenfone 2 ZE550KL (Z00L):__ LuK1337, luca020400
+* __Asus Zenfone 2 ZE551KL/ZD551KL (Z00T):__ LuK1337, luca020400
 * __B&N NookColor (encore):__ eyeballer, fattire, keyodi, krylon360, sluo (NookieDevs)
 * __B&N Nook Tablet (acclaim):__  chrmhoffmann
 * __Google Android One:__ varunchitre15
@@ -49,6 +51,8 @@ Maintainers (CyanogenMod 13.0):
 * __HTC One X:__ gorbi16, mdeejay, tbalden, Thömy
 * __HTC One X+:__ Lloir, tombriden
 * __HTC One XL:__ h8rift, intervigil, jrior001
+* __Huawei Ascend Mate 2:__ mdmower, u-ra
+* __Huawei Honor 4/4X (cherry):__ dianlujitao, surdupetru, desalesouche
 * __LG G2 (AT&T) (D800):__ arcee, Rashed97, Shelnutt2
 * __LG G2 (T-Mobile) (D801):__ arcee, Rashed97, Shelnutt2
 * __LG G2 (International) (D802):__ arcee, Rashed97, Shelnutt2
@@ -60,13 +64,14 @@ Maintainers (CyanogenMod 13.0):
 * __LG G3 (Canada) (D852):__ cuzz1369
 * __LG G3 (International) (D855):__ finnq
 * __LG G3 (Korea) (F400):__ TheNoFace
-* __LG G3 (Sprint) (LS990):__
+* __LG G3 (Sprint) (LS990):__ Kasual
 * __LG G3 (Verizon) (VS985):__ invisiblek
 * __LG G4 (T-Mobile) (H811):__ codeworkx, genesixxbf3
 * __LG G4 (International) (H815):__ codeworkx, genesixxbf3
 * __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, ashwin007
+* __LG V10 (T-Mobile) (H901):__ genesixxbf3
+* __Moto E 2014 (xt1021,xt1022,xt1023/condor):__
 * __Moto G 2014 (xt1063,xt1064,xt1068,xt1069/titan):__ LuK1337, luca020400
 * __Moto G 4G (xt1039,xt1040,xt1042,xt1045/peregrine):__ somcom3x, intervigil
 * __Moto G 4G 2014 (xt1072,xt1077,xt1078,xt1079/thea):__ LuK1337, luca020400
@@ -89,6 +94,7 @@ Maintainers (CyanogenMod 13.0):
 * __Motorola Xoom 3G (UMTS):__ bazar, SteadyHawkin, TDR (Team Rogue)
 * __Motorola Xoom 4G LTE (Verizon):__ bazar, SteadyHawkin, TDR (Team Rogue)
 * __OnePlus One:__ cyanogen, intervigil, inwotep, arcee
+* __OnePlus X:__ ashwin007, MasterAwesome
 * __Oppo Find 5:__ intervigil, nebkat, raymanfx
 * __Oppo Find 7:__ intervigil, tdm, inwotep, mikeioannina
 * __Oppo N1:__ raymanfx
@@ -101,10 +107,10 @@ Maintainers (CyanogenMod 13.0):
 * __Samsung Fascinate / Mesmerize (SCH-I500):__ jt1134, sbrissen
 * __Samsung Galaxy Note (GT-N7000):__ Espenfjo
 * __Samsung Galaxy Note II (GT-N7100):__ nebkat
-* __Samsung Galaxy Note II LTE (AT&T) (SGH-I317):__ cyanogen
-* __Samsung Galaxy Note II LTE (Verizon) (SCH-I605):__ sbrissen
-* __Samsung Galaxy Note II LTE (Sprint) (SPH-L900):__ sbrissen
-* __Samsung Galaxy Note II LTE (USCC) (SCH-R950):__ sbrissen
+* __Samsung Galaxy Note II LTE (AT&T) (SGH-I317):__ cyanogen, rogersb11
+* __Samsung Galaxy Note II LTE (Verizon) (SCH-I605):__ sbrissen, rogersb11
+* __Samsung Galaxy Note II LTE (Sprint) (SPH-L900):__ sbrissen, rogersb11
+* __Samsung Galaxy Note II LTE (USCC) (SCH-R950):__ sbrissen, rogersb11
 * __Samsung Galaxy Note III (hlte):__ cyanogen, noobnl, slayher
 * __Samsung Galaxy Note IV Exynos (trelte):__ raymanfx
 * __Samsung Galaxy Note IV Exynos (trhplte):__ raymanfx
@@ -122,6 +128,7 @@ Maintainers (CyanogenMod 13.0):
 * __Samsung Galaxy S II (T-Mobile) (SGH-T989):__ mikeyman77
 * __Samsung Galaxy S II (AT&T) (SGH-I727):__ topprospect
 * __Samsung Galaxy S III (AT&T) (SGH-I747):__ nardholio
+* __Samsung Galaxy S III (intl) (GT-I9300):__ forkbomb
 * __Samsung Galaxy S III (Sprint) (SPH-L710):__ noobnl
 * __Samsung Galaxy S III (Verizon) (SCH-I535):__ invisiblek
 * __Samsung Galaxy S III LTE (GT-I9305):__ mcampbellsmith
@@ -169,6 +176,7 @@ Maintainers (CyanogenMod 13.0):
 * __Sony Z Ultra GPE (togari_gpe):__ FreeXperia Team
 * __Xiaomi Mi2(s) (aries):__ Michael Zimmermann
 * __Xiaomi Mi3/4 (cancro):__ JoeyRizzoli
+* __ZTE Nubia Z9 Max (nx510j):__ dianlujitao
 
 FreeXperia Team:
 -------------------
diff --git a/ambientsdk/Android.mk b/ambientsdk/Android.mk
new file mode 100644
index 0000000..56ea1f4
--- /dev/null
+++ b/ambientsdk/Android.mk
@@ -0,0 +1,27 @@
+# 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.
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := ambientsdk
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_UNINSTALLABLE_MODULE := true
+
+LOCAL_MAVEN_REPO := https://repo1.maven.org/maven2
+LOCAL_MAVEN_GROUP := com.cyngn.ambient
+LOCAL_MAVEN_ARTIFACT := ambientsdk
+LOCAL_MAVEN_VERSION := 1.4.0
+LOCAL_MAVEN_PACKAGING := aar
+
+include $(BUILD_MAVEN_PREBUILT)
diff --git a/build/core/apicheck_msg_current.txt b/build/core/apicheck_msg_current.txt
new file mode 100644
index 0000000..f58858e
--- /dev/null
+++ b/build/core/apicheck_msg_current.txt
@@ -0,0 +1,143 @@
+
+******************************
+You have tried to change the API from what has been previously approved.
+
+To make these errors go away, you have two choices:
+   1) You can add "@hide" javadoc comments to the methods, etc. listed in the
+      errors above.
+
+   2) You can update current.txt by executing the following command:
+         make update-cm-api
+
+      ^^^^^^^^^^^^^^^^^^
+      CONGRATS YOU EARNED A STINKEYE FROM CID!
+
+
+              .                                                                                                        ``
+           `+++++                                                                                                    ;++++'
+           +++++++                                                                                                  ;++++++'
+          ++++++++,                                                                                                 ++++++++
+          +++++++++                                                                                                :++++++++`
+          +++++++++                                                                                                +++++++++`
+          ++++++++++                                                                                               +++++++++
+           +++++++++                                                                                              ++++++++++
+           +++++++++:                                                                                             +++++++++
+           :+++++++++                                                                                            ;+++++++++
+            +++++++++`                                                                                           +++++++++,
+            ++++++++++                                                                                          `+++++++++
+             +++++++++                                                                                          ++++++++++
+             +++++++++;                                                                                         +++++++++
+             ,+++++++++                                                                                        '+++++++++
+              +++++++++.                                                                                       +++++++++,
+              '+++++++++                                                                                      .+++++++++
+               +++++++++                                                                                      +++++++++'
+               +++++++++'                                                                                     +++++++++
+               .+++++++++                                                                                    '+++++++++
+                +++++++++,                                                                                   +++++++++.
+                ;+++++++++                                                                                  ,+++++++++
+                 +++++++++                                                                                  +++++++++;
+                 ++++++++++                    .,;;+++++++++++++++++++++++++++++++++;,,.                    +++++++++
+                 `+++++++++          ,;++++++++++++++++++++++++++++++++++++++++++++++++++++++++',`         ++++++++++
+                  +++++++++,   :++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++;.   +++++++++`
+                  ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++:
+                   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                 ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+               ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+             :+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+            ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++;
+          ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+         ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+        ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++`
+       ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++`
+      ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+     '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+     +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+   ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  `+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++.
+  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++.
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++.
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'.       ,+++++++++++++++++++++++++++.
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'              .++++++++++++++++++++++++.
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'                  `++++++++++++++++++++++.
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                      ;++++++++++++++++++++.
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'                         +++++++++++++++++++.
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++;                           ++++++++++++++++++.
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++;                             +++++++++++++++++.
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                               ++++++++++++++++.
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                                ;+++++++++++++++.
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++`                                 +++++++++++++++.
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                                   ++++++++++++++.
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                                    ++++++++++++++.
+ ++++++++++++++++++        .,;+++++++++++++++++++++++++++++++++++++++++++++++++++++                                    .+++++++++++++.
+ ++++++++++++++++++                      .,;++++++++++++++++++++++++++++++++++++++:                                     +++++++++++++.
+ ++++++++++++++++++                                    .,+++++++++++++++++++++++++                                      +++++++++++++.
+ +++++++++++++++++.                                      +++++++++++++++++++++++++                                      ,++++++++++++.
+ +++++++++++++++++                                       ;++++++++++++++++++++++++                                       ++++++++++++.
+ +++++++++++++++++                                       ,+++++++++++++++++++++++;                                       ++++++++++++.
+ +++++++++++++++++                                       .+++++++++++++++++++++++,                                       ++++++++++++.
+ +++++++++++++++++                                       .+++++++++++++++++++++++,                                       ++++++++++++.
+ +++++++++++++++++                                       .+++++++++++++++++++++++,                                       ++++++++++++.
+ +++++++++++++++++                                       :+++++++++++++++++++++++;                                       ++++++++++++.
+ +++++++++++++++++`                                      +++++++++++++++++++++++++                                       ++++++++++++.
+ +++++++++++++++++;                                      +++++++++++++++++++++++++                                       ++++++++++++.
+ ++++++++++++++++++                                      +++++++++++++++++++++++++                                      ;++++++++++++.
+ ++++++++++++++++++                                     ,+++++++++++++++++++++++++                                      +++++++++++++.
+ ++++++++++++++++++:                                    ++++++++++++++++++++++++++'                                     +++++++++++++.
+ +++++++++++++++++++                                    +++++++++++++++++++++++++++                                    ;+++++++++++++.
+ +++++++++++++++++++,                                  ++++++++++++++++++++++++++++,                                   ++++++++++++++.
+ ++++++++++++++++++++                                  +++++++++++++++++++++++++++++                                  ;++++++++++++++.
+ ++++++++++++++++++++'                                ++++++++++++++++++++++++++++++'                                 +++++++++++++++.
+ +++++++++++++++++++++,                              ++++++++++++++++++++++++++++++++                                ++++++++++++++++.
+ ++++++++++++++++++++++                             ;+++++++++++++++++++++++++++++++++                              '++++++++++++++++.
+ +++++++++++++++++++++++                           ;+++++++++++++++++++++++++++++++++++                            :+++++++++++++++++.
+ ++++++++++++++++++++++++,                        '+++++++++++++++++++++++++++++++++++++                          ;++++++++++++++++++.
+ +++++++++++++++++++++++++'                      ++++++++++++++++++++++++++++++++++++++++                        ++++++++++++++++++++.
+ +++++++++++++++++++++++++++,                  '++++++++++++++++++++++++++++++++++++++++++'                     +++++++++++++++++++++.
+ +++++++++++++++++++++++++++++:              '++++++++++++++++++++++++++++++++++++++++++++++,                 +++++++++++++++++++++++.
+ ++++++++++++++++++++++++++++++++;`      .++++++++++++++++++++++++++++++++++++++++++++++++++++'            ,+++++++++++++++++++++++++.
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++',..,;+++++++++++++++++++++++++++++.
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++.
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++.
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++.
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++`
+  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++;++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++     ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+   .+++++++++++++++++++++++++++++++++++++++++++++++++++++++:           .,++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++:         :+++++++++++++++++++++++++++++++++++++++++++++++++++++++
+     +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++,   .++++++++++++++++++++++++++++++++++++++++++++++++++++++'
+     ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+      ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+       ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+        ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+         '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+          ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+            ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++,
+             .++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'
+               ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                 .++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++;
+                    ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++`
+                       :+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++`
+                           ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++,
+                               .;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++,
+                                      ,;+++++++++++++++++++++++++++++++++++++++++++++++++++++++:.
+                                                ..,;;+++++++++++++++++++++++++++++;:,.
+
+      To submit the revised current.txt to the main CyanogenMod repository,
+      you will need approval.
+******************************
\ No newline at end of file
diff --git a/build/core/config.mk b/build/core/config.mk
index 57bb514..c6fb529 100644
--- a/build/core/config.mk
+++ b/build/core/config.mk
@@ -22,6 +22,7 @@ FRAMEWORK_CM_PLATFORM_API_FILE := $(TOPDIR)vendor/cmsdk/api/cm_current.txt
 FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE := $(TOPDIR)vendor/cmsdk/api/cm_removed.txt
 FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE := $(TOPDIR)vendor/cmsdk/system-api/cm_system-current.txt
 FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE := $(TOPDIR)vendor/cmsdk/system-api/cm_system-removed.txt
+FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/cm/build/core/apicheck_msg_current.txt
 
 BUILD_MAVEN_PREBUILT := $(TOP)/vendor/replicant/build/core/maven_artifact.mk
 PUBLISH_MAVEN_PREBUILT := $(TOP)/vendor/replicant/build/core/maven_artifact_publish.mk
diff --git a/build/core/apicheck.mk b/build/tasks/apicheck.mk
index b0df939..3be3cae 100644
--- a/build/core/apicheck.mk
+++ b/build/tasks/apicheck.mk
@@ -25,11 +25,8 @@ ifeq (,$(filter true, $(WITHOUT_CHECK_API) $(TARGET_BUILD_PDK)))
 # Run the checkapi rules by default.
 droidcore: checkapi-cm
 
-cm_last_released_sdk_version := $(lastword $(call numerically_sort, \
-            $(filter-out current, \
-                $(patsubst $(CM_SRC_API_DIR)/%.txt,%, $(wildcard $(CM_SRC_API_DIR)/*.txt)) \
-             )\
-        ))
+# Validate against current platform sdk version api text within prebuilts
+cm_last_released_sdk_version := $(CM_PLATFORM_SDK_VERSION)
 
 .PHONY: check-cm-public-api
 checkapi-cm : check-cm-public-api
@@ -41,6 +38,8 @@ checkapi-cm : check-cm-public-api
 # (See vendor/cmsdk/Android.mk)
 # we need to add api-stubs as additional dependency of the api check.
 
+$(INTERNAL_CM_PLATFORM_API_FILE): cm-api-stubs-docs
+
 # Check that the API we're building hasn't broken the last-released
 # SDK version.
 $(eval $(call check-api, \
@@ -49,12 +48,14 @@ $(eval $(call check-api, \
     $(INTERNAL_CM_PLATFORM_API_FILE), \
     $(FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE), \
     $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE), \
-    cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \
+    -hide 2 -hide 3 -hide 4 -hide 5 -hide 6 -hide 24 -hide 25 -hide 26 -hide 27 \
+    -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \
+    -error 16 -error 17 -error 18 , \
+    cat $(FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT), \
     check-cm-public-api, \
-    $(call doc-timestamp-for, cm-api-stubs) \
+    $(call doc-timestamp-for,cm-api-stubs) \
     ))
 
-
 # Check that the API we're building hasn't changed from the not-yet-released
 # SDK version.
 $(eval $(call check-api, \
@@ -63,9 +64,13 @@ $(eval $(call check-api, \
     $(INTERNAL_CM_PLATFORM_API_FILE), \
     $(FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE), \
     $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE), \
-    cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \
+    -error 2 -error 3 -error 4 -error 5 -error 6 \
+    -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \
+    -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \
+    -error 25 -error 26 -error 27, \
+    cat $(FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT), \
     check-cm-public-api, \
-    $(call doc-timestamp-for, cm-api-stubs) \
+    $(call doc-timestamp-for,cm-api-stubs) \
     ))
 
 .PHONY: update-cm-public-api
@@ -81,7 +86,9 @@ update-cm-api : update-cm-public-api
 .PHONY: check-cm-system-api
 checkapi-cm : check-cm-system-api
 
-# Check that the Cyanogen System API we're building hasn't broken the last-released
+$(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE): cm-system-api-stubs-docs
+
+# Check that the System API we're building hasn't broken the last-released
 # SDK version.
 $(eval $(call check-api, \
     checksystemapi-cm-last, \
@@ -89,9 +96,12 @@ $(eval $(call check-api, \
     $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE), \
     $(FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \
     $(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \
-    cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \
+    -hide 2 -hide 3 -hide 4 -hide 5 -hide 6 -hide 24 -hide 25 -hide 26 -hide 27 \
+    -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \
+    -error 16 -error 17 -error 18 , \
+    cat $(FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT), \
     check-cm-system-api, \
-    $(call doc-timestamp-for, cm-system-api-stubs) \
+    $(call doc-timestamp-for,cm-system-api-stubs) \
     ))
 
 # Check that the System API we're building hasn't changed from the not-yet-released
@@ -102,9 +112,13 @@ $(eval $(call check-api, \
     $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE), \
     $(FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \
     $(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \
-    cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \
+    -error 2 -error 3 -error 4 -error 5 -error 6 \
+    -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \
+    -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \
+    -error 25 -error 26 -error 27, \
+    cat $(FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT), \
     check-cm-system-api, \
-    $(call doc-timestamp-for, cm-system-api-stubs) \
+    $(call doc-timestamp-for,cm-system-api-stubs) \
     ))
 
 .PHONY: update-cm-system-api
diff --git a/build/tasks/generate_cmsdk_coverage.mk b/build/tasks/generate_cmsdk_coverage.mk
new file mode 100644
index 0000000..d9be81a
--- /dev/null
+++ b/build/tasks/generate_cmsdk_coverage.mk
@@ -0,0 +1,76 @@
+#
+# Copyright (C) 2010 The Android Open Source Project
+# 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.
+#
+
+# Makefile for producing cmsdk coverage reports.
+# Run "make cmsdk-test-coverage" in the $ANDROID_BUILD_TOP directory.
+
+cts_api_coverage_exe := $(HOST_OUT_EXECUTABLES)/cts-api-coverage
+dexdeps_exe := $(HOST_OUT_EXECUTABLES)/dexdeps
+
+coverage_out := $(HOST_OUT)/cmsdk-api-coverage
+
+api_text_description := vendor/cmsdk/api/cm_current.txt
+api_xml_description := $(coverage_out)/api.xml
+$(api_xml_description) : $(api_text_description) $(APICHECK)
+	$(hide) echo "Converting API file to XML: $@"
+	$(hide) mkdir -p $(dir $@)
+	$(hide) $(APICHECK_COMMAND) -convert2xml $< $@
+
+cmsdk-test-coverage-report := $(coverage_out)/test-coverage.html
+
+cmsdk_tests_apk := $(call intermediates-dir-for,APPS,CMPlatformTests)/package.apk
+cmsdk_api_coverage_dependencies := $(cts_api_coverage_exe) $(dexdeps_exe) $(api_xml_description)
+
+$(cmsdk-test-coverage-report): PRIVATE_TEST_CASES := $(cmsdk_tests_apk)
+$(cmsdk-test-coverage-report): PRIVATE_CTS_API_COVERAGE_EXE := $(cts_api_coverage_exe)
+$(cmsdk-test-coverage-report): PRIVATE_DEXDEPS_EXE := $(dexdeps_exe)
+$(cmsdk-test-coverage-report): PRIVATE_API_XML_DESC := $(api_xml_description)
+$(cmsdk-test-coverage-report): $(cmsdk_tests_apk) $(cmsdk_api_coverage_dependencies) | $(ACP)
+	$(call generate-cm-coverage-report,"CMSDK API Coverage Report",\
+			$(PRIVATE_TEST_CASES),html)
+
+.PHONY: cmsdk-test-coverage
+cmsdk-test-coverage : $(cmsdk-test-coverage-report)
+
+# Put the test coverage report in the dist dir if "cmsdk" is among the build goals.
+ifneq ($(filter cmsdk, $(MAKECMDGOALS)),)
+  $(call dist-for-goals, cmsdk, $(cmsdk-test-coverage-report):cmsdk-test-coverage-report.html)
+endif
+
+# Arguments;
+#  1 - Name of the report printed out on the screen
+#  2 - List of apk files that will be scanned to generate the report
+#  3 - Format of the report
+define generate-cm-coverage-report
+	$(hide) mkdir -p $(dir $@)
+	$(hide) $(PRIVATE_CTS_API_COVERAGE_EXE) -d $(PRIVATE_DEXDEPS_EXE) -a $(PRIVATE_API_XML_DESC) -f $(3) -o $@ $(2) -cm
+	@ echo $(1): file://$(ANDROID_BUILD_TOP)/$@
+endef
+
+# Reset temp vars
+cmsdk_api_coverage_dependencies :=
+cmsdk-combined-coverage-report :=
+cmsdk-combined-xml-coverage-report :=
+cmsdk-verifier-coverage-report :=
+cmsdk-test-coverage-report :=
+api_xml_description :=
+api_text_description :=
+coverage_out :=
+dexdeps_exe :=
+cmsdk_api_coverage_exe :=
+cmsdk_verifier_apk :=
+android_cmsdk_zip :=
diff --git a/config/cmsdk_common.mk b/config/cmsdk_common.mk
new file mode 100644
index 0000000..4aad982
--- /dev/null
+++ b/config/cmsdk_common.mk
@@ -0,0 +1,41 @@
+# Permissions for cmsdk services
+PRODUCT_COPY_FILES += \
+    vendor/cm/config/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml \
+    vendor/cm/config/permissions/org.cyanogenmod.livelockscreen.xml:system/etc/permissions/org.cyanogenmod.livelockscreen.xml
+
+# CM Platform Library
+PRODUCT_PACKAGES += \
+    org.cyanogenmod.platform-res \
+    org.cyanogenmod.platform \
+    org.cyanogenmod.platform.xml
+
+# CM Hardware Abstraction Framework
+PRODUCT_PACKAGES += \
+    org.cyanogenmod.hardware \
+    org.cyanogenmod.hardware.xml
+
+ifndef CM_PLATFORM_SDK_VERSION
+  # This is the canonical definition of the SDK version, which defines
+  # the set of APIs and functionality available in the platform.  It
+  # is a single integer that increases monotonically as updates to
+  # 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 := 5
+endif
+
+ifndef CM_PLATFORM_REV
+  # For internal SDK revisions that are hotfixed/patched
+  # Reset after each CM_PLATFORM_SDK_VERSION release
+  # If you are doing a release and this is NOT 0, you are almost certainly doing it wrong
+  CM_PLATFORM_REV := 0
+endif
+
+# CyanogenMod Platform SDK Version
+PRODUCT_PROPERTY_OVERRIDES += \
+  ro.cm.build.version.plat.sdk=$(CM_PLATFORM_SDK_VERSION)
+
+# CyanogenMod Platform Internal
+PRODUCT_PROPERTY_OVERRIDES += \
+  ro.cm.build.version.plat.rev=$(CM_PLATFORM_REV)
+
diff --git a/config/common.mk b/config/common.mk
index 745b888..7007aa5 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -125,13 +125,12 @@ 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/replicant/config/permissions/org.cyanogenmod.livelockscreen.xml:system/etc/permissions/org.cyanogenmod.livelockscreen.xml
-
 # Theme engine
 include vendor/replicant/config/themes_common.mk
 
+# CMSDK
+include vendor/replicant/config/cmsdk_common.mk
+
 # Required CM packages
 PRODUCT_PACKAGES += \
     Development \
@@ -159,16 +158,9 @@ PRODUCT_PACKAGES += \
     CMSettingsProvider \
     ExactCalculator
 
-# CM Platform Library
+# Exchange support
 PRODUCT_PACKAGES += \
-    org.cyanogenmod.platform-res \
-    org.cyanogenmod.platform \
-    org.cyanogenmod.platform.xml
-
-# CM Hardware Abstraction Framework
-PRODUCT_PACKAGES += \
-    org.cyanogenmod.hardware \
-    org.cyanogenmod.hardware.xml
+    Exchange2
 
 # Extra tools in CM
 PRODUCT_PACKAGES += \
@@ -231,7 +223,7 @@ endif
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.sys.root_access=0
 
-PRODUCT_PACKAGE_OVERLAYS += vendor/replicant/overlay/common
+DEVICE_PACKAGE_OVERLAYS += vendor/replicant/overlay/common
 
 ifeq ($(USE_OPENGL_RENDERER),true)
 PRODUCT_PACKAGE_OVERLAYS += vendor/replicant/overlay/opengl
@@ -277,37 +269,9 @@ ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey)
 endif
 endif
 
-# by default, do not update the recovery with system updates
-PRODUCT_PROPERTY_OVERRIDES += persist.sys.recovery_update=false
-
-ifndef CM_PLATFORM_SDK_VERSION
-  # This is the canonical definition of the SDK version, which defines
-  # the set of APIs and functionality available in the platform.  It
-  # is a single integer that increases monotonically as updates to
-  # 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 := 5
-endif
-
-ifndef CM_PLATFORM_REV
-  # For internal SDK revisions that are hotfixed/patched
-  # Reset after each CM_PLATFORM_SDK_VERSION release
-  # If you are doing a release and this is NOT 0, you are almost certainly doing it wrong
-  CM_PLATFORM_REV := 0
-endif
-
 PRODUCT_PROPERTY_OVERRIDES += \
   ro.cm.display.version=$(CM_DISPLAY_VERSION)
 
-# CyanogenMod Platform SDK Version
-PRODUCT_PROPERTY_OVERRIDES += \
-  ro.cm.build.version.plat.sdk=$(CM_PLATFORM_SDK_VERSION)
-
-# CyanogenMod Platform Internal
-PRODUCT_PROPERTY_OVERRIDES += \
-  ro.cm.build.version.plat.rev=$(CM_PLATFORM_REV)
-
 -include $(WORKSPACE)/build_env/image-auto-bits.mk
 
 -include vendor/cyngn/product.mk
diff --git a/config/themes_common.mk b/config/themes_common.mk
index eaeb2d2..f16b52b 100644
--- a/config/themes_common.mk
+++ b/config/themes_common.mk
@@ -3,6 +3,3 @@ PRODUCT_PACKAGES += \
     aapt \
     ThemeChooser \
     ThemesProvider
-
-PRODUCT_COPY_FILES += \
-    vendor/replicant/config/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml
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 25625c2..214ceb9 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -49,21 +49,8 @@
     <string-array translatable="false" name="config_globalActionsList">
         <item>power</item>
         <item>reboot</item>
-        <item>profile</item>
         <item>airplane</item>
         <item>bugreport</item>
         <item>users</item>
     </string-array>
-
-    <!-- Defines external services to be started by the SystemServer at boot. The service itself
-         should publish as a binder services in its onStart -->
-    <string-array name="config_externalCMServices">
-        <item>org.cyanogenmod.platform.internal.CMStatusBarManagerService</item>
-        <item>org.cyanogenmod.platform.internal.ProfileManagerService</item>
-        <item>org.cyanogenmod.platform.internal.PartnerInterfaceService</item>
-        <item>org.cyanogenmod.platform.internal.CMTelephonyManagerService</item>
-        <item>org.cyanogenmod.platform.internal.CMHardwareService</item>
-        <item>org.cyanogenmod.platform.internal.AppSuggestManagerService</item>
-        <item>org.cyanogenmod.platform.internal.PerformanceManagerService</item>
-    </string-array>
 </resources>
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 753257d..dcea5f4 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -76,6 +76,7 @@
   <apn carrier="Hi Mobiel Internet" mcc="204" mnc="08" apn="portalmmm.nl" proxy="" port="" user="" password="" mmsc="http://mp.mobiel.kpn/mmsc" mmsproxy="10.10.100.20" mmsport="5080" type="*" spn="HI" />
   <apn carrier="Simyo Mobiel Internet" mcc="204" mnc="08" apn="portalmmm.nl" proxy="" port="" user="" password="" mmsc="http://mp.mobiel.kpn/mmsc" mmsproxy="10.10.100.20" mmsport="5080" authtype="1" type="default,supl,mms" />
   <apn carrier="Ortel Internet" mcc="204" mnc="08" apn="portalmmm.nl" proxy="" port="" user="" password="" mmsc="http://mp.mobiel.kpn/mmsc" mmsproxy="10.10.100.20" mmsport="5080" authtype="1" type="default,supl,mms" />
+  <apn carrier="Yufone Internet" mcc="204" mnc="08" apn="portalmmm.nl" proxy="" port="" user="" password="" type="default" />
   <apn carrier="Lebara Internet" mcc="204" mnc="08" apn="multimedia.lebara.nl" proxy="" port="" user="" password="" mmsc="http://mp.mobiel.kpn/mmsc" mmsproxy="10.10.100.20" mmsport="5080" authtype="1" type="default,supl,mms" />
   <apn carrier="AH Mobiel Internet" mcc="204" mnc="08" apn="multimedia.ah.nl" proxy="" port="" user="" password="" mmsc="http://mms" mmsproxy="193.113.200.195" mmsport="8080" type="*" spn="AH Mobiel" />
   <apn carrier="MVNO NL" mcc="204" mnc="08" apn="internet.mvno.mobi" user="mvno" password="mvno" authtype="1" type="default,supl" mvno_match_data="204080950" mvno_type="imsi" />
@@ -459,10 +460,8 @@
   <apn carrier="Cosmote Internet" mcc="226" mnc="06" apn="internet" user="" password="" authtype="3" type="default,supl" />
   <apn carrier="Cosmote MMS" mcc="226" mnc="06" apn="mms" proxy="" port="" mmsproxy="10.252.1.62" mmsport="8080" mmsc="http://mmsc1.mms.cosmote.ro:8002" user="" password="" authtype="3" type="mms" />
   <apn carrier="web'n'walk" mcc="226" mnc="06" apn="wnw" user="wnw" password="wnw" type="default,supl" />
-  <apn carrier="Orange World" mcc="226" mnc="10" apn="wap" proxy="062.217.247.252" port="8799" mmsc="" user="wap" password="wap" authtype="1" type="default,supl" />
-  <apn carrier="Orange Internet" mcc="226" mnc="10" apn="internet" user="" password="" type="default,supl" />
-  <apn carrier="Orange MMS" mcc="226" mnc="10" apn="mms" proxy="" port="" mmsproxy="062.217.247.252" mmsport="8799" mmsc="http://wap.mms.orange.ro:8002" user="mms" password="mms" authtype="3" type="mms" />
-  <apn carrier="Orange Internet" mcc="226" mnc="10" apn="net" type="default,supl" />
+  <apn carrier="Orange MMS" mcc="226" mnc="10" apn="mms" proxy="" port="" mmsproxy="62.217.247.252" mmsport="8799" mmsc="http://wap.mms.orange.ro:8002" user="" password="" type="mms" />
+  <apn carrier="Orange Internet" mcc="226" mnc="10" apn="net" user="" password="" type="default,supl" />
   <apn carrier="Swisscom" mcc="228" mnc="01" apn="gprs.swisscom.ch" user="" password="" authtype="3" type="default,supl" />
   <apn carrier="Swisscom-MMS" mcc="228" mnc="01" apn="event.swisscom.ch" proxy="" port="" mmsproxy="192.168.210.2" mmsport="8080" mmsc="http://mms.natel.ch:8079" user="" password="" authtype="3" type="mms" />
   <apn carrier="RBM Internet" mcc="228" mnc="02" apn="internet" user="" password="" type="default,supl" />
@@ -828,62 +827,17 @@
   <apn carrier="Lycamobile SE" mcc="240" mnc="12" apn="data.lycamobile.se" user="lmse" password="plus" type="default,supl" />
   <apn carrier="Telenor MMS" mcc="240" mnc="24" apn="services.telenor.se" proxy="" port="" user="" password="" mmsc="http://mms" mmsproxy="173.30.253.241" mmsport="8799" type="mms" />
   <apn carrier="Telenor Mobilsurf" mcc="240" mnc="24" apn="services.telenor.se" proxy="173.30.253.241" port="8799" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="Telenor" mcc="242" mnc="01" apn="telenor" user="" password="" type="default,supl" spn="TELENOR" />
-  <apn carrier="Telenor MMS" mcc="242" mnc="01" apn="mms" proxy="" port="" mmsproxy="10.10.10.11" mmsport="8080" mmsc="http://mmsc/" user="" password="" type="mms" spn="TELENOR" />
   <apn carrier="Telenor" mcc="242" mnc="01" apn="telenor.smart" mmsc="http://mmsc/" mmsproxy="mms-proxy.telenor.no" mmsport="8080" type="default,supl,mms" protocol="IPV4V6" roaming_protocol="IP" />
-  <apn carrier="Telenor MMS" mcc="242" mnc="01" apn="telenor" proxy="" port="" user="" password="" mmsc="http://mmsc/" mmsproxy="10.10.10.11" mmsport="8080" type="mms" />
-  <apn carrier="Telenor" mcc="242" mnc="01" apn="telenor" proxy="" port="" user="" password="" mmsc="" authtype="1" type="default,supl" />
   <apn carrier="Mobitalk" mcc="242" mnc="01" apn="telenor" user="dj" password="dj" proxy="10.10.10.10" port="8080" mmsc="http://mmsc/" mmsproxy="10.10.10.11" mmsport="8080" type="default,supl,mms" />
-  <apn carrier="Talkmore" mcc="242" mnc="01" apn="telenor" type="default,supl,mms" />
-  <apn carrier="Phonero Internett" mcc="242" mnc="01" apn="internet.phonero.no" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
+  <apn carrier="Phonero Internet" mcc="242" mnc="01" apn="internet.phonero.no" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
   <apn carrier="Phonero MMS" mcc="242" mnc="01" apn="mms.phonero.no" proxy="" port="" user="phonero" password="1111" mmsc="http://mmsc" mmsproxy="10.10.10.11" mmsport="8080" type="mms" />
-  <apn carrier="TDC MMS" mcc="242" mnc="01" apn="mms.no" proxy="" port="" user="" password="" mmsc="http://mms.tdcmobil.no:8002" mmsproxy="194.182.251.15" mmsport="8080" type="mms" />
-  <apn carrier="TDC Internet" mcc="242" mnc="01" apn="internet.no" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="TDC WAP" mcc="242" mnc="01" apn="internet.no" proxy="194.182.251.15" port="8080" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="Tele2 Internet" mcc="242" mnc="01" apn="internet.tele2.no" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="Tele2 MMS" mcc="242" mnc="01" apn="internet.tele2.no" proxy="" port="" user="" password="" mmsc="http://mmsc.tele2.no" mmsproxy="193.12.40.14" mmsport="8080" type="mms" />
-  <apn carrier="djuice MMS" mcc="242" mnc="01" apn="mms" proxy="" port="" user="" password="" mmsc="http://mmsc/" mmsproxy="10.10.10.11" mmsport="8080" type="mms" />
-  <apn carrier="djuice WAP" mcc="242" mnc="01" apn="telenor" proxy="" port="" user="" password="" mmsc="" authtype="1" type="default,supl" />
-  <apn carrier="TalkMore MMS" mcc="242" mnc="01" apn="mms" proxy="" port="" user="" password="" mmsc="http://mmsc/" mmsproxy="10.10.10.11" mmsport="8080" type="mms" />
-  <apn carrier="TalkMore WAP" mcc="242" mnc="01" apn="telenor" proxy="" port="" user="" password="" mmsc="" authtype="1" type="default,supl" />
-  <apn carrier="NetCom Internet" mcc="242" mnc="02" apn="netcom" user="" password="" type="default,supl" spn="NetCom" />
-  <apn carrier="NetCom MMS" mcc="242" mnc="02" apn="netcom" proxy="" port="" mmsproxy="212.169.66.4" mmsport="8080" mmsc="http://mm/" user="mms" password="netcom" type="mms" spn="NetCom" />
-  <apn carrier="NetCom Internett" mcc="242" mnc="02" apn="wap" type="default,supl" />
-  <apn carrier="NetCom MMS" mcc="242" mnc="02" apn="mms.netcom.no" proxy="" port="" user="mms" password="netcom" mmsc="http://mm/" mmsproxy="212.169.66.4" mmsport="8080" type="mms" />
-  <apn carrier="Chess Mobil" mcc="242" mnc="02" apn="netcom" user="" password="" type="default,supl" spn="Chess" />
-  <apn carrier="Chess MMS" mcc="242" mnc="02" apn="mms.netcom.no" proxy="" port="" mmsproxy="212.169.66.4" mmsport="8080" mmsc="http://mm/" user="chess" password="chess" type="mms" spn="Chess" />
-  <apn carrier="Chess MMS" mcc="242" mnc="02" apn="mms.netcom.no" user="chess" password="chess" mmsc="http://mms/" mmsproxy="193.209.134.133" mmsport="8080" type="mms" />
-  <apn carrier="Chess Internet" mcc="242" mnc="02" apn="netcom" user="chess" password="chess" proxy="10.254.254.10" port="8080" type="default,supl" />
-  <apn carrier="Chess Internet" mcc="242" mnc="02" apn="internet.netcom.no" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="Tele2 NO Internet" mcc="242" mnc="03" apn="internet.tele2.no" type="default,supl" />
-  <apn carrier="Tele2 NO MMS" mcc="242" mnc="03" apn="mms.tele2.no" user="wap" password="wap" mmsc="mmsc.tele2.no" mmsproxy="192.12.40.14:8080" type="mms" />
-  <apn carrier="T3 ISP GPRS" mcc="242" mnc="03" apn="www.teletopia.no" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="T3 WAP" mcc="242" mnc="03" apn="www.teletopia.no" proxy="172.16.172.16" port="9201" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="T3 MMS" mcc="242" mnc="03" apn="www.teletopia.no" proxy="" port="" user="" password="" mmsc="http://mmsc/" mmsproxy="172.16.172.16" mmsport="9201" type="mms" />
+  <apn carrier="NetCom" mcc="242" mnc="02" apn="netcom" proxy="10.254.254.10" port="8080" mmsc="http://mm/" mmsproxy="212.169.66.4" mmsport="8080" type="default,supl,mms" />
   <apn carrier="Tele2 Internet" mcc="242" mnc="04" apn="internet.tele2.no" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
   <apn carrier="Tele2 MMS" mcc="242" mnc="04" apn="internet.tele2.no" proxy="" port="" user="" password="" mmsc="http://mmsc.tele2.no" mmsproxy="193.12.40.14" mmsport="8080" type="mms" />
-  <apn carrier="Internet" mcc="242" mnc="05" apn="internet" user="" password="" type="default,supl" spn="Onecall" />
-  <apn carrier="MMS" mcc="242" mnc="05" apn="mms" proxy="" port="" mmsproxy="188.149.250.10" mmsport="80" mmsc="http://mms.nwn.no" user="" password="" type="mms" spn="Onecall" />
-  <apn carrier="NwN" mcc="242" mnc="05" apn="internet" type="default,supl" />
+  <apn carrier="NwN Internet" mcc="242" mnc="05" apn="internet" type="default,supl" />
   <apn carrier="NwN MMS" mcc="242" mnc="05" apn="mms" mmsc="http://mms.nwn.no" mmsproxy="188.149.250.10" mmsport="80" type="mms" />
-  <apn carrier="MyCall Internet" mcc="242" mnc="05" apn="internet" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="MyCall MMS" mcc="242" mnc="05" apn="mms" proxy="" port="" user="" password="" mmsc="http://mms.nwn.no" mmsproxy="89.254.65.20" mmsport="80" type="mms" />
-  <apn carrier="OneCall Internet" mcc="242" mnc="05" apn="internet" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="OneCall WAP" mcc="242" mnc="05" apn="wap" proxy="89.254.65.20" port="80" user="nwn" password="nwn" mmsc="" type="default,supl" />
-  <apn carrier="OneCall MMS" mcc="242" mnc="05" apn="mms" proxy="" port="" user="" password="" mmsc="http://mms.nwn.no" mmsproxy="89.254.65.20" mmsport="80" type="mms" />
-  <apn carrier="Lebara Internet" mcc="242" mnc="05" apn="internet" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="Lebara WAP" mcc="242" mnc="05" apn="wap" proxy="89.254.65.20" port="80" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="Lebara MMS" mcc="242" mnc="05" apn="mms" proxy="" port="" user="" password="" mmsc="http://mms.nwn.no" mmsproxy="89.254.65.20" mmsport="80" type="mms" />
-  <apn carrier="NwN Internet" mcc="242" mnc="05" apn="internet" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="NwN MMS" mcc="242" mnc="05" apn="mms" proxy="" port="" user="" password="" mmsc="http://mms.nwn.no" mmsproxy="89.254.65.20" mmsport="80" type="mms" />
-  <apn carrier="TDC" mcc="242" mnc="08" apn="internet" user="" password="" authtype="3" type="default,supl" />
-  <apn carrier="TDC mms" mcc="242" mnc="08" apn="MMS" proxy="" port="" mmsproxy="inetproxy.tdc.dk" mmsport="8080" mmsc="http://mmsc.tdc.dk:8002" user="" password="" authtype="3" type="mms" />
-  <apn carrier="Chess Internet" mcc="242" mnc="45" apn="internet.netcom.no" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="Chess MMS" mcc="242" mnc="45" apn="mms.netcom.no" proxy="" port="" user="chess" password="chess" mmsc="http://mm/" mmsproxy="212.169.66.4" mmsport="8080" type="mms" />
-  <apn carrier="Chess Internet" mcc="242" mnc="56" apn="internet.netcom.no" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="Chess MMS" mcc="242" mnc="56" apn="mms.netcom.no" proxy="" port="" user="chess" password="chess" mmsc="http://mm/" mmsproxy="212.169.66.4" mmsport="8080" type="mms" />
-  <apn carrier="Chess Internet" mcc="242" mnc="79" apn="internet.netcom.no" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="Chess MMS" mcc="242" mnc="79" apn="mms.netcom.no" proxy="" port="" user="chess" password="chess" mmsc="http://mm/" mmsproxy="212.169.66.4" mmsport="8080" type="mms" />
+  <apn carrier="TDC Internet" mcc="242" mnc="08" apn="internet" user="" password="" authtype="3" type="default,supl" />
+  <apn carrier="TDC MMS" mcc="242" mnc="08" apn="mms" proxy="" port="" mmsproxy="inetproxy.tdc.dk" mmsport="8080" mmsc="http://mmsc.tdc.dk:8002" user="" password="" authtype="3" type="mms" />
   <apn carrier="DNA Internet" mcc="244" mnc="03" apn="internet" type="default,supl" />
   <apn carrier="DNA WAP" mcc="244" mnc="03" apn="wap" proxy="10.1.1.1" port="80" mmsc="" user="" password="" type="default,supl" />
   <apn carrier="DNA MMS" mcc="244" mnc="03" apn="mms" user="dna" password="mms" mmsc="http://mmsc.dnafinland.fi/" mmsproxy="10.1.1.2" mmsport="8080" type="mms" />
@@ -1463,6 +1417,7 @@
   <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" />
+  <apn carrier="ATT Nextgenphone" mcc="310" mnc="170" apn="nxtgenphone" mmsc="http://mmsc.mobile.att.net" mmsproxy="proxy.mobile.att.net" mmsport="80" type="default,mms,supl,fota,hipri" protocol="IPV4V6" roaming_protocol="IPV4V6" mtu="1410" />
   <apn carrier="DataConnect" mcc="310" mnc="170" apn="isp.cingular" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
   <apn carrier="Cingular MMS" mcc="310" mnc="170" apn="wap.cingular" proxy="" port="" user="WAP@CINGULARGPRS.COM" password="CINGULAR1" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.32" mmsport="8080" type="mms" />
   <apn carrier="ATT WAP" mcc="310" mnc="180" apn="wap.cingular" proxy="wireless.cingular.com" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="wireless.cingular.com" mmsport="80" type="default,mms" />
@@ -1518,7 +1473,7 @@
   <apn carrier="COET Web" name="COET Web" apn="web.celloneet.com" user="user1@web.celloneet.com" password="celloneet" server="http://192.168.100.14" mmsc="http://192.168.100.14" mmsproxy="209.4.229.81" mmsport="9201" mcc="310" mnc="390" type="default,supl,mms" authtype="1" />
   <apn carrier="Celloneet MMS" mcc="310" mnc="390" apn="mms.celloneet.com" proxy="" port="" user="user1@mms.celloneet.com" password="celloneet" mmsc="http://mms.celloneet.com/servlets/mms" mmsproxy="63.99.231.135" mmsport="8080" type="mms" />
   <apn carrier="ATT" mcc="310" mnc="410" apn="phone" mmsc="http://mmsc.mobile.att.net/" mmsproxy="proxy.mobile.att.net" mmsport="80" type="default,mms,supl" />
-  <apn carrier="Net10" mcc="310" mnc="410" apn="tfdata" port="8080" mmsc="http://mms-tf.net" mmsproxy="mms3.tracfone.com" mmsport="80" type="default,mms,supl" />
+  <apn carrier="Net10" mcc="310" mnc="410" apn="tfdata" mmsc="http://mms-tf.net" mmsproxy="mms3.tracfone.com" mmsport="80" type="default,mms,supl" />
   <apn carrier="Straight Talk" mcc="310" mnc="410" apn="tfdata" port="80" mmsc="http://mms-tf.net" mmsproxy="mms3.tracfone.com" mmsport="80" mvno_type="gid" mvno_match_data="deff" type="default,mms,supl" />
   <apn carrier="Red Pocket" mcc="310" mnc="410" apn="PRODATA" port="" mmsc="http://mmsc.mobile.att.net" mmsproxy="proxy.mobile.att.net" mmsport="80" mvno_type="gid" mvno_match_data="4201" type="default,mms,supl" />
   <apn carrier="Black Wireless" mcc="310" mnc="410" apn="att.mvno" proxy="66.209.11.33" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.33" mmsport="80" type="default,mms,supl,agps,fota" authtype="1" />
diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc
index 7cf6ec5..1f66b77 100644
--- a/prebuilt/common/etc/init.local.rc
+++ b/prebuilt/common/etc/init.local.rc
@@ -63,6 +63,8 @@ on boot
     chmod 0664 /sys/devices/system/cpu/cpufreq/interactive/up_threshold_any_cpu_load
     chown system system /sys/devices/system/cpu/cpufreq/interactive/sampling_down_factor
     chmod 0664 /sys/devices/system/cpu/cpufreq/interactive/sampling_down_factor
+    chown system system /sys/devices/system/cpu/cpufreq/interactive/max_freq_hysteresis
+    chmod 0664 /sys/devices/system/cpu/cpufreq/interactive/max_freq_hysteresis
 
     # ondemand governor
     chown system system /sys/devices/system/cpu/cpufreq/ondemand/boostfreq
diff --git a/sepolicy/platform_app.te b/sepolicy/platform_app.te
index db8647d..bbd4dd4 100644
--- a/sepolicy/platform_app.te
+++ b/sepolicy/platform_app.te
@@ -2,3 +2,6 @@
 # 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;
+
+# Allow Gallery3D to crop user images
+allow platform_app system_app_data_file:file rw_file_perms;
diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te
index 76e7a62..da6ddac 100644
--- a/sepolicy/recovery.te
+++ b/sepolicy/recovery.te
@@ -29,6 +29,9 @@ allow recovery sdcard_posix:file r_file_perms;
 # Control properties
 allow recovery recovery_prop:property_service set;
 
+# Set property sys.usb.ffs.ready
+allow recovery ffs_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 };
diff --git a/sepolicy/service.te b/sepolicy/service.te
index 579e2b8..1a6559f 100644
--- a/sepolicy/service.te
+++ b/sepolicy/service.te
@@ -9,3 +9,5 @@ type cm_telephony_service, system_api_service, system_server_service, service_ma
 type cm_hardware_service, system_api_service, system_server_service, service_manager_type;
 type cm_app_suggest_service, system_api_service, system_server_service, service_manager_type;
 type cm_performance_service, system_api_service, system_server_service, service_manager_type;
+type cm_themes_service, system_api_service, system_server_service, service_manager_type;
+type cm_iconcache_service, system_api_service, system_server_service, service_manager_type;
diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts
index 4baf0f8..04efc6f 100644
--- a/sepolicy/service_contexts
+++ b/sepolicy/service_contexts
@@ -9,3 +9,5 @@ cmtelephonymanager                        u:object_r:cm_telephony_service:s0
 cmhardware                                u:object_r:cm_hardware_service:s0
 cmappsuggest                              u:object_r:cm_app_suggest_service:s0
 cmperformance                             u:object_r:cm_performance_service:s0
+cmthemes                                  u:object_r:cm_themes_service:s0
+cmiconcache                               u:object_r:cm_iconcache_service:s0
diff --git a/sepolicy/su.te b/sepolicy/su.te
index 9cd6345..473386b 100644
--- a/sepolicy/su.te
+++ b/sepolicy/su.te
@@ -64,4 +64,6 @@ userdebug_or_eng(`
   allow system_app superuser_device:sock_file { read write create setattr unlink getattr };
   allow system_app sudaemon:unix_stream_socket { connectto read write setopt ioctl };
   allow system_app superuser_device:dir { create rw_dir_perms setattr unlink };
+
+  allow kernel sudaemon:fd { use };
 ')