From 8d21e67e9f2ff61eef7fadf196768cbd12672948 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Fri, 5 Feb 2016 17:18:16 +0800 Subject: [PATCH 01/34] contributors: Add cherry and nx510j Change-Id: I454553414ff39e15dd850b636047532e4c2f4b77 --- CONTRIBUTORS.mkdn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index e4d54761..09e9c067 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -44,6 +44,7 @@ Maintainers (CyanogenMod 13.0): * __HTC One X:__ gorbi16, mdeejay, tbalden, Thömy * __HTC One X+:__ Lloir, tombriden * __HTC One XL:__ h8rift, intervigil, jrior001 +* __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 @@ -164,6 +165,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: ------------------- From d914b185b90fc12e4b19b53cc40da321c5c16cfb Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 5 Feb 2016 00:36:49 +0200 Subject: [PATCH 02/34] Remove leftover profiles entry from power menu * No longer available Change-Id: Ifac7e1181dc53af5788f54444ef75a345a888fa2 --- overlay/common/frameworks/base/core/res/res/values/config.xml | 1 - 1 file changed, 1 deletion(-) 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 25625c27..3db6b39d 100644 --- a/overlay/common/frameworks/base/core/res/res/values/config.xml +++ b/overlay/common/frameworks/base/core/res/res/values/config.xml @@ -49,7 +49,6 @@ power reboot - profile airplane bugreport users From ce212158a52147374a3d4f13e51dcc89af648a7b Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Mon, 8 Feb 2016 18:04:38 +1100 Subject: [PATCH 03/34] contributors: add i9300 Change-Id: I947ac687e7604c41bae51c4f9a66a15bb041c34d --- CONTRIBUTORS.mkdn | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index 09e9c067..4c0ba121 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -118,6 +118,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 From e738087fdd63a70cd0c0546427c812ae6f02a9c6 Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Tue, 9 Feb 2016 11:04:37 -0800 Subject: [PATCH 04/34] cm: Provide verbosity for checkapi-cm. Also a helper text for how to unbreak yourself. TICKET: CYNGNOS-1950 Change-Id: I8311e19905b507c3a65eba37a6b4ea6606108e4f --- build/core/apicheck.mk | 35 ++++--- build/core/apicheck_msg_current.txt | 143 ++++++++++++++++++++++++++++ build/core/config.mk | 1 + 3 files changed, 168 insertions(+), 11 deletions(-) create mode 100644 build/core/apicheck_msg_current.txt diff --git a/build/core/apicheck.mk b/build/core/apicheck.mk index b0df9391..796bcb16 100644 --- a/build/core/apicheck.mk +++ b/build/core/apicheck.mk @@ -49,12 +49,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 +65,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 +87,7 @@ 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 +# Check that the System API we're building hasn't broken the last-released # SDK version. $(eval $(call check-api, \ checksystemapi-cm-last, \ @@ -89,22 +95,29 @@ $(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 # SDK version. $(eval $(call check-api, \ - checksystemapi-cm-current, \ + checkpublicapi-cm-current, \ $(FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE), \ $(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/core/apicheck_msg_current.txt b/build/core/apicheck_msg_current.txt new file mode 100644 index 00000000..f58858eb --- /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 e3b19487..2e90a6f9 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/cm/build/core/maven_artifact.mk PUBLISH_MAVEN_PREBUILT := $(TOP)/vendor/cm/build/core/maven_artifact_publish.mk From f84ce1b73884cd36d663bd1cb5c4ba2419e2ef9d Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Tue, 9 Feb 2016 11:38:40 -0800 Subject: [PATCH 05/34] cm: Fix checkapi makefile typo. Change-Id: I96d1acba8e8f665dabf6d18dac5fc5c3132ad0f7 TICKET: CYNGNOS-1950 --- build/core/apicheck.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/core/apicheck.mk b/build/core/apicheck.mk index 796bcb16..d9fb4881 100644 --- a/build/core/apicheck.mk +++ b/build/core/apicheck.mk @@ -106,7 +106,7 @@ $(eval $(call check-api, \ # Check that the System API we're building hasn't changed from the not-yet-released # SDK version. $(eval $(call check-api, \ - checkpublicapi-cm-current, \ + checksystemapi-cm-current, \ $(FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE), \ $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE), \ $(FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \ From 15697319cacf8faed9365312fd0d1093ec234410 Mon Sep 17 00:00:00 2001 From: Pat Erley Date: Tue, 9 Feb 2016 10:43:31 -0800 Subject: [PATCH 06/34] sepolicy: Allow system server and uncrypt access pipe System server needs to be able to create a pipe in the cache partition for uncrypting OTAs. Uncrypt needs to be able to read and write the pipe. Change-Id: Ie03ee7d637eaecff8fe38bf03dc733b3915cd336 --- sepolicy/system_server.te | 1 + sepolicy/uncrypt.te | 1 + 2 files changed, 2 insertions(+) diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te index a9000b6a..6aaf50c6 100644 --- a/sepolicy/system_server.te +++ b/sepolicy/system_server.te @@ -1,5 +1,6 @@ allow system_server recovery_cache_file:dir rw_dir_perms; allow system_server recovery_cache_file:file create_file_perms; +allow system_server recovery_cache_file:fifo_file create_file_perms; # Persistent properties allow system_server persist_property_file:dir rw_dir_perms; diff --git a/sepolicy/uncrypt.te b/sepolicy/uncrypt.te index 2e545a79..978f9e1b 100644 --- a/sepolicy/uncrypt.te +++ b/sepolicy/uncrypt.te @@ -1,3 +1,4 @@ r_dir_file(uncrypt, media_rw_data_file) allow uncrypt recovery_cache_file:dir create_dir_perms; allow uncrypt recovery_cache_file:file create_file_perms; +allow uncrypt recovery_cache_file:fifo_file rw_file_perms; From 97ac30ec9ca43bdb008c00656c8063b1de2bcbcb Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Wed, 10 Feb 2016 14:43:35 -0800 Subject: [PATCH 07/34] cm: Set explicit dependencies on stubs for checkapi-cm. Change-Id: I2c8b8425262a6812f1061326c55ffc7418967444 TICKET: CYNGNOS-1950 --- build/{core => tasks}/apicheck.mk | 4 ++++ 1 file changed, 4 insertions(+) rename build/{core => tasks}/apicheck.mk (98%) diff --git a/build/core/apicheck.mk b/build/tasks/apicheck.mk similarity index 98% rename from build/core/apicheck.mk rename to build/tasks/apicheck.mk index d9fb4881..219e9246 100644 --- a/build/core/apicheck.mk +++ b/build/tasks/apicheck.mk @@ -41,6 +41,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, \ @@ -87,6 +89,8 @@ update-cm-api : update-cm-public-api .PHONY: check-cm-system-api checkapi-cm : check-cm-system-api +$(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, \ From 3f9f7a6b3db424c85d512c8edc445236ff6fa3b0 Mon Sep 17 00:00:00 2001 From: genesixx Date: Thu, 11 Feb 2016 11:56:33 +0100 Subject: [PATCH 08/34] contributors: add LG V10 Change-Id: Ia791576dee92aad832b83e7e28a8aeaf2fbcb487 --- CONTRIBUTORS.mkdn | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index 4c0ba121..cbd2a22c 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -62,6 +62,7 @@ Maintainers (CyanogenMod 13.0): * __LG G4 (International) (H815):__ codeworkx, genesixxbf3 * __LG Optimus LTE (P930) / LG Nitro HD {P935):__ arcee * __LG Optimus LTE (SK Telecom) (SU640):__ arcee +* __LG V10 (T-Mobile) (H901):__ genesixxbf3 * __Moto E 2014 (xt1021,xt1022,xt1023/condor):__ percy_g2, scritch007, ashwin007 * __Moto G 2014 (xt1063,xt1064,xt1068,xt1069/titan):__ LuK1337, luca020400 * __Moto G 4G (xt1039,xt1040,xt1042,xt1045/peregrine):__ somcom3x, intervigil From 137ba2e27871e30dc68c05e801c21f51680e8348 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Fri, 12 Feb 2016 10:07:15 -0600 Subject: [PATCH 09/34] Contributors: Add mt2 dolts For the record, I do not like my name being first here. When all is said and done, u-ra chose his handle unwisely and is relegated to the end of the alphabet -- a doltish move. Change-Id: Ib1f15af12c1118e6fda5673b08e870dfdb941e15 --- CONTRIBUTORS.mkdn | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index cbd2a22c..7a804968 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -44,6 +44,7 @@ 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 From cb8c139a35c3399a83bfaecbb3a66cfe11e23577 Mon Sep 17 00:00:00 2001 From: rogersb11 Date: Sat, 13 Feb 2016 21:57:59 -0500 Subject: [PATCH 10/34] Contributors: Update Note 2 Change-Id: I8e7b11ed12dd3ef8c7d542bcb0204c72f48590e9 --- CONTRIBUTORS.mkdn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index 7a804968..dfad7da7 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -99,10 +99,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 From 3f4d8432e39952f8c746a39f2e787806ef3eafbd Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Tue, 16 Feb 2016 00:44:37 +0100 Subject: [PATCH 11/34] Cleanup APN list for Norway * wap? WAP? What?!? Are we living in the dark ages with our dumbphones? :) * Remove redundant Telenor entries * Tele2 are part of NetCom now, and all users have been transferred there * Talkmore and djuice can use the Telenor APN * Remove providers that doesn't exist anymore * Update some APNs according to info on providers webpage * Consolidate some APNs Change-Id: I2bd6441e476aebf1c0c63b34d659efce40e42847 --- prebuilt/common/etc/apns-conf.xml | 55 +++---------------------------- 1 file changed, 5 insertions(+), 50 deletions(-) diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml index 753257d1..b301e92a 100644 --- a/prebuilt/common/etc/apns-conf.xml +++ b/prebuilt/common/etc/apns-conf.xml @@ -828,62 +828,17 @@ - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - + - - - + - - - - - - - - - - - - - - - - - - + + From 2b4ec05fc01930a67f91c56edefa9e81414da38e Mon Sep 17 00:00:00 2001 From: Scott Mertz Date: Tue, 16 Feb 2016 09:09:43 -0800 Subject: [PATCH 12/34] Revert "recovery: default recovery updating to false" The default behavior is as if this setting is off. There's no need to set it. Settings will now set it at boot if not configured. This reverts commit e0e8c2772ec580d5a69adf742ede09f438b18399. OPO-490 Change-Id: I77963dfc9eea8ece25ed1b6b17bd2c6936ae69ee --- config/common.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/common.mk b/config/common.mk index 0b900d09..e8bc6765 100644 --- a/config/common.mk +++ b/config/common.mk @@ -326,9 +326,6 @@ 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 From 2880cc802b31de2ef4bc5a3a0f641a92fd495ca8 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Thu, 4 Feb 2016 13:46:39 -0600 Subject: [PATCH 13/34] apns: Net10 310410: Fix port The 8080 port appears to be only for the T-Mobile mvno, not the AT&T mvno. Change-Id: I44330aaa98fdcc9b577ed507ed0be093750c0afe --- prebuilt/common/etc/apns-conf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml index b301e92a..1ede23bc 100644 --- a/prebuilt/common/etc/apns-conf.xml +++ b/prebuilt/common/etc/apns-conf.xml @@ -1473,7 +1473,7 @@ - + From 4a2f567dc91e3551e9c724144040ce4ed4ff4005 Mon Sep 17 00:00:00 2001 From: Dave Daynard Date: Sat, 16 Jan 2016 10:26:18 -0500 Subject: [PATCH 14/34] init: add permissions for max_freq_hysteresis node Change-Id: If556282e37daabf270be4af922c7c9a4112c3771 --- prebuilt/common/etc/init.local.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc index 7cf6ec52..1f66b776 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 From ec0322e31b4b879af32459ce0c0e40a1170e1243 Mon Sep 17 00:00:00 2001 From: FrozenCow Date: Mon, 11 Jan 2016 23:10:47 +0100 Subject: [PATCH 15/34] cm: sepolicy: allow kernel to read storage This fixes issues where the kernel would need to read and write files from internal or external storage. More specifically, the kernel needs these rules for USB mass storage to work correctly. Change-Id: I8cb0307727bc0c464d5470e55275ad808e748ee0 --- sepolicy/su.te | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sepolicy/su.te b/sepolicy/su.te index 9cd63452..473386bc 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 }; ') From 36cb29d509ae438a9e9ed61f6742a8263e9766ec Mon Sep 17 00:00:00 2001 From: AdrianDC Date: Mon, 8 Feb 2016 19:12:58 +0100 Subject: [PATCH 16/34] recovery: Add new rule for sys.usb.ffs.ready init: avc: denied { set } for property=sys.usb.ffs.ready scontext=u:r:recovery:s0 tcontext=u:object_r:ffs_prop:s0 tclass=property_service Change-Id: Id3441ccc3c6a8915a5fdf50efd8c617d1242868a --- sepolicy/recovery.te | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te index 76e7a626..da6ddaca 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 }; From 92b72594dae5fa119aeceb5a477a6c1f92ef880f Mon Sep 17 00:00:00 2001 From: Evan Widger Date: Wed, 24 Feb 2016 13:18:41 -0800 Subject: [PATCH 17/34] add yufone APN per https://jira.cyanogenmod.org/browse/CYAN-7425 Change-Id: I4feedaa1303ccc98876b5160b1866a277c2ceac3 --- prebuilt/common/etc/apns-conf.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml index 1ede23bc..c2f0300d 100644 --- a/prebuilt/common/etc/apns-conf.xml +++ b/prebuilt/common/etc/apns-conf.xml @@ -76,6 +76,7 @@ + From 7ad2824e37fc2b806bf52f9a572c048763571416 Mon Sep 17 00:00:00 2001 From: Ashwin Ramesh Date: Sat, 20 Feb 2016 02:11:05 -0800 Subject: [PATCH 18/34] vendor: Add maintainers of OnePlus X (onyx) Change-Id: Idb645be038d29291afd4e7c7846d86712c5a6e63 --- CONTRIBUTORS.mkdn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index dfad7da7..935e6a71 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -64,7 +64,7 @@ Maintainers (CyanogenMod 13.0): * __LG Optimus LTE (P930) / LG Nitro HD {P935):__ arcee * __LG Optimus LTE (SK Telecom) (SU640):__ arcee * __LG V10 (T-Mobile) (H901):__ genesixxbf3 -* __Moto E 2014 (xt1021,xt1022,xt1023/condor):__ percy_g2, scritch007, ashwin007 +* __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 @@ -87,6 +87,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 From e7036e838762d007c683013837f62a4bbd42eb67 Mon Sep 17 00:00:00 2001 From: d34d Date: Wed, 24 Feb 2016 15:55:39 -0800 Subject: [PATCH 19/34] Themes: Refactor themes to CMSDK [3/6] Change-Id: Ia8f3a5080f2ca2cecc3474058db4970c5661c89c TICKET: CYNGNOS-2126 --- overlay/common/frameworks/base/core/res/res/values/config.xml | 2 ++ sepolicy/service.te | 2 ++ sepolicy/service_contexts | 2 ++ 3 files changed, 6 insertions(+) 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 3db6b39d..6fc2b017 100644 --- a/overlay/common/frameworks/base/core/res/res/values/config.xml +++ b/overlay/common/frameworks/base/core/res/res/values/config.xml @@ -64,5 +64,7 @@ org.cyanogenmod.platform.internal.CMHardwareService org.cyanogenmod.platform.internal.AppSuggestManagerService org.cyanogenmod.platform.internal.PerformanceManagerService + org.cyanogenmod.platform.internal.ThemeManagerService + org.cyanogenmod.platform.internal.IconCacheManagerService diff --git a/sepolicy/service.te b/sepolicy/service.te index 579e2b86..1a6559f5 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 4baf0f8d..04efc6fe 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 From 651dd50e592e811e14388ec265e3fce5e850e0ce Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Thu, 3 Mar 2016 10:55:21 -0800 Subject: [PATCH 20/34] cm: Create cmsdk coverage task. Add ability to `make cmsdk-test-coverage` to generate an html page which denotes how much the testing package from vendor/cmsdk covers public interfaces. Change-Id: I76556df1822934a6b7e86ebf2ff42e302acff46d TICKET: CYNGNOS-2189 --- build/tasks/generate_cmsdk_coverage.mk | 76 ++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 build/tasks/generate_cmsdk_coverage.mk diff --git a/build/tasks/generate_cmsdk_coverage.mk b/build/tasks/generate_cmsdk_coverage.mk new file mode 100644 index 00000000..d9be81aa --- /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 := From fd28e9d8193e246802a8357beeaa2230aebee419 Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Fri, 26 Feb 2016 15:05:15 -0800 Subject: [PATCH 21/34] Include AmbientSDK artifact This module will be required by a number of packages across the build tree. The artifact is currently hosted on Maven Central and the version defined in the mk file is the latest version of the artifact available in the repository. **Note: this change will require Maven to build (v3 is recommended). Change-Id: I9459ae21b0f4c8f88d2b3a2b5014a36b17b9651b --- ambientsdk/Android.mk | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 ambientsdk/Android.mk diff --git a/ambientsdk/Android.mk b/ambientsdk/Android.mk new file mode 100644 index 00000000..56ea1f46 --- /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) From 6f978dca19dc81c028d08223e9523b08b73af371 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 7 Mar 2016 17:53:49 +0100 Subject: [PATCH 22/34] Add Z00T maintainers Change-Id: Iad23d053ec3fd4dc809e60f5b5f05bb3fb26cec4 --- CONTRIBUTORS.mkdn | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index 935e6a71..a8ae2d49 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -13,6 +13,7 @@ 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 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 From 8ab71a00baf5e917973f0e0012816f07896d1d82 Mon Sep 17 00:00:00 2001 From: Kasual Date: Wed, 2 Mar 2016 16:58:52 -0800 Subject: [PATCH 23/34] vendor: Add maintainer for LG G3 (Sprint) (LS990) Change-Id: I23b4bbc9ffeb6a31bd5f087ba36b6e1df2836fec --- CONTRIBUTORS.mkdn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index a8ae2d49..401e1000 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -58,7 +58,7 @@ 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 From fd018d525398a4ee01c87b3fcbeb0987de40d530 Mon Sep 17 00:00:00 2001 From: Evan Widger Date: Mon, 8 Feb 2016 12:18:32 -0800 Subject: [PATCH 24/34] Modify APN for Orange Romania per https://jira.cyanogenmod.org/browse/CYAN-7253 Change-Id: I56f2b0d390a8b5af36dceacc522a1d38da0c73e8 --- prebuilt/common/etc/apns-conf.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml index c2f0300d..de772b37 100644 --- a/prebuilt/common/etc/apns-conf.xml +++ b/prebuilt/common/etc/apns-conf.xml @@ -460,10 +460,8 @@ - - - - + + From 6a04a23a52642ec226e6e2b1eeab4498b0923b06 Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Thu, 10 Mar 2016 12:01:04 -0800 Subject: [PATCH 25/34] cm: Always verify against current CMSDK version. Since cmsdk prebuilts lives in a single master branch, previous branches that apicheck will fail since they'll verify against an api that exists in future releases. Change-Id: I56594d075b89cb1a3d7a606cc9c1699dfffd94cb TICKET: CYNGNOS-2220 --- build/tasks/apicheck.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/build/tasks/apicheck.mk b/build/tasks/apicheck.mk index 219e9246..3be3cae1 100644 --- a/build/tasks/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 From 15c9ef4cc3c4786767a5db6a9e20c6486c21389a Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Fri, 11 Mar 2016 14:09:52 +0000 Subject: [PATCH 26/34] config: Lower the priority of vendor/cm overlays The priority order for overlays is PRODUCT > DEVICE > LOCAL Having PRODUCT here was overriding all of the DEVICE_ specifics mentioned in device repositories, which was not the intent. vendor/cm is present as a set of sane defaults, but for the most part these overlays are intended to be overridable by the device if needed. The logic is that PRODUCT_PACKAGE_OVERLAYS should be used by a particular product while DEVICE_PACKAGE_OVERLAYS is used by several products that share common device configs. Yeah, the naming is counterintiuitive, but that's the implementation in build/core/package_internal.mk Partially addresses CYNGNOS-2229 Change-Id: Icfbc92593e37f3c00c3d26dd09e08d09267621ed --- config/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/common.mk b/config/common.mk index e8bc6765..4bdde31c 100644 --- a/config/common.mk +++ b/config/common.mk @@ -229,7 +229,7 @@ endif PRODUCT_PROPERTY_OVERRIDES += \ persist.sys.root_access=0 -PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/common +DEVICE_PACKAGE_OVERLAYS += vendor/cm/overlay/common PRODUCT_VERSION_MAJOR = 13 PRODUCT_VERSION_MINOR = 0 From 73acac5b16d9f258e5bd579d9afa81c2c527656e Mon Sep 17 00:00:00 2001 From: Abhisek Devkota Date: Fri, 11 Mar 2016 09:50:43 -0800 Subject: [PATCH 27/34] Resolve Orange RO authtype Change-Id: I81b78437e5e7b90ce8958973804e6a183f6e7a3a --- prebuilt/common/etc/apns-conf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml index de772b37..eb9a1cd0 100644 --- a/prebuilt/common/etc/apns-conf.xml +++ b/prebuilt/common/etc/apns-conf.xml @@ -460,7 +460,7 @@ - + From bc61d8609fd426139c2a8c9d9082e155d7818738 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Fri, 11 Mar 2016 17:22:13 -0800 Subject: [PATCH 28/34] apns: Add ATT Nextgenphone * For AT&T IPV6 / VoLTE enabled devices. Change-Id: I403de7d4e52eb4e9d13ad221e61b9a8b8336a01b --- prebuilt/common/etc/apns-conf.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml index eb9a1cd0..6e988b76 100644 --- a/prebuilt/common/etc/apns-conf.xml +++ b/prebuilt/common/etc/apns-conf.xml @@ -1417,6 +1417,7 @@ + From 8b0f16fc3ff213fbdeba865ef942ef4df761b785 Mon Sep 17 00:00:00 2001 From: Kasual Date: Fri, 11 Mar 2016 21:41:56 -0500 Subject: [PATCH 29/34] apns: fix build Change-Id: I4136da8c23f4508b41099178837b2cdce4aa2f01 --- prebuilt/common/etc/apns-conf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml index 6e988b76..dcea5f40 100644 --- a/prebuilt/common/etc/apns-conf.xml +++ b/prebuilt/common/etc/apns-conf.xml @@ -1417,7 +1417,7 @@ - + From cf03e166beb89285bb605d47bd70d1cc5d02ba33 Mon Sep 17 00:00:00 2001 From: Abhisek Devkota Date: Mon, 14 Mar 2016 12:45:43 -0800 Subject: [PATCH 30/34] Bring back Exchange2 Dropped out via r22, but we want this Change-Id: Iec52790d7c69594d1101d9062fb649a3aca866ab --- config/common.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/common.mk b/config/common.mk index 4bdde31c..736f1c48 100644 --- a/config/common.mk +++ b/config/common.mk @@ -157,6 +157,10 @@ PRODUCT_PACKAGES += \ CMSettingsProvider \ ExactCalculator +# Exchange support +PRODUCT_PACKAGES += \ + Exchange2 + # CM Platform Library PRODUCT_PACKAGES += \ org.cyanogenmod.platform-res \ From 8f239ee5c95c2b256732ce3984a2325e88dbc753 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Tue, 15 Mar 2016 21:17:24 +0100 Subject: [PATCH 31/34] Add Z00L maintainers Change-Id: I2cb96af2bb6dd270643d33882a715ae094f96f29 --- CONTRIBUTORS.mkdn | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index 401e1000..e30bd19f 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -13,6 +13,7 @@ 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 From 649c8328e5fc826f2c26cad5cba572baa609d99b Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Tue, 15 Mar 2016 14:17:19 -0700 Subject: [PATCH 32/34] cm: Remove externalCMServices overlay. (in cmsdk) Change-Id: I518653830afd40a187bbbc56e145230671dbac49 --- .../frameworks/base/core/res/res/values/config.xml | 14 -------------- 1 file changed, 14 deletions(-) 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 6fc2b017..214ceb98 100644 --- a/overlay/common/frameworks/base/core/res/res/values/config.xml +++ b/overlay/common/frameworks/base/core/res/res/values/config.xml @@ -53,18 +53,4 @@ bugreport users - - - - org.cyanogenmod.platform.internal.CMStatusBarManagerService - org.cyanogenmod.platform.internal.ProfileManagerService - org.cyanogenmod.platform.internal.PartnerInterfaceService - org.cyanogenmod.platform.internal.CMTelephonyManagerService - org.cyanogenmod.platform.internal.CMHardwareService - org.cyanogenmod.platform.internal.AppSuggestManagerService - org.cyanogenmod.platform.internal.PerformanceManagerService - org.cyanogenmod.platform.internal.ThemeManagerService - org.cyanogenmod.platform.internal.IconCacheManagerService - From f3610f55e70cbd9f6cfbb20e6fcdb3c6eeca77a9 Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Tue, 15 Mar 2016 14:17:47 -0700 Subject: [PATCH 33/34] cm: Commonize cmsdk specific targets. Change-Id: I5e2f0b84ed34244b7549daf91053258193dd716f --- config/cmsdk_common.mk | 41 +++++++++++++++++++++++++++++++++++++++ config/common.mk | 43 +++-------------------------------------- config/themes_common.mk | 3 --- 3 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 config/cmsdk_common.mk diff --git a/config/cmsdk_common.mk b/config/cmsdk_common.mk new file mode 100644 index 00000000..4aad9829 --- /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 736f1c48..a808822b 100644 --- a/config/common.mk +++ b/config/common.mk @@ -121,13 +121,12 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ vendor/cm/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/cm/config/themes_common.mk +# CMSDK +include vendor/cm/config/cmsdk_common.mk + # Required CM packages PRODUCT_PACKAGES += \ Development \ @@ -161,17 +160,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ Exchange2 -# 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 - # Extra tools in CM PRODUCT_PACKAGES += \ libsepol \ @@ -330,34 +318,9 @@ ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey) endif endif -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 c3bcfa93..f16b52b5 100644 --- a/config/themes_common.mk +++ b/config/themes_common.mk @@ -3,6 +3,3 @@ PRODUCT_PACKAGES += \ aapt \ ThemeChooser \ ThemesProvider - -PRODUCT_COPY_FILES += \ - vendor/cm/config/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml From b7c8dec762fa745dd1c06d2a8a007cfec31128b2 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sat, 5 Mar 2016 18:05:05 +0100 Subject: [PATCH 34/34] cm: sepolicy: allow platform apps to crop user images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed for gallery3d when setting contact pics avc: denied { write } for comm=4173796E635461736B202334 path="/data/data/com.android.settings/cache/CropEditUserPhoto.jpg" dev="mmcblk0p50" ino=65849 scontext=u:r:platform_app:s0:c512,c768 tcontext=u:object_r:system_app_data_file:s0 tclass=file permissive=0 03-05 13:07:40.741 22060-22207/com.android.gallery3d W/System.err﹕ java.io.IOException: write failed: EACCES (Permission denied) Change-Id: Iaa7f75abfd41c86e1a321d5f35b950f9dc7eb930 --- sepolicy/platform_app.te | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sepolicy/platform_app.te b/sepolicy/platform_app.te index db8647d3..bbd4dd41 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;