From 04864b10aa4d409eec0bdf47f410c0aab5237c68 Mon Sep 17 00:00:00 2001 From: herriojr Date: Fri, 15 Jan 2016 15:44:50 -0800 Subject: Fixed Maven Artifactory to work with jack Prebuilts weren't generating their .jack file when doing an mm or mmm but would work with a brunch or full make. This makes it so mmm/mm will properly generate it. Change-Id: If5ccd1b557ef124b3c57fa09b172ec11caff886e --- build/core/maven_artifact.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build/core/maven_artifact.mk b/build/core/maven_artifact.mk index 08491d2..5f6a2a1 100644 --- a/build/core/maven_artifact.mk +++ b/build/core/maven_artifact.mk @@ -50,6 +50,17 @@ $(LOCAL_PREBUILT_MODULE_FILE): -DoutputDirectory=$(dir $@) @echo -e ${CL_GRN}"Download:"${CL_RST}" $@" +ifneq ($(filter-out disabled, $(LOCAL_JACK_ENABLED)),) +# This is required to be defined before the LOCAL_MODULES target below gets defined, it's a NOOP registered again in +# BUILD_PREBUILT. This is done because BUILD_PREBUILT doesn't actually handle generating the .jack files properly and +# only generates a target but doesn't set the LOCAL_MODULE dependent on it. +$(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON): + +# This adds another step required for LOCAL_MODULE to be completed -- generating the jack file, it just so happens +# to be built when doing a brunch, but not when doing an mmm, so this makes it work with both +$(LOCAL_MODULE): $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON)/classes.jack +endif # LOCAL_JACK_ENABLED is full or partial + include $(BUILD_PREBUILT) # the "fetchprebuilts" target will go through and pre-download all of the maven dependencies in the tree -- cgit v1.1 From fc52e707e8e448f476b856ce7d4ff6abed9e85fb Mon Sep 17 00:00:00 2001 From: myfluxi Date: Sun, 17 Jan 2016 23:38:36 +0100 Subject: cm: Update maintainers Change-Id: Ibe69fe6730a2f34c44bd7df5892dd25adb90e4f3 --- CONTRIBUTORS.mkdn | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index 0a68f1d..81b353d 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -16,11 +16,14 @@ Maintainers (CyanogenMod 13.0): * __Google Android One:__ varunchitre15 * __Google Galaxy Nexus:__ bekit, Bumble-Bee, burnsra, KalimochoAz, something15525 * __Google Nexus S:__ burnsra, KalimochoAz, klusark -* __Google Nexus 4:__ rmcc -* __Google Nexus 5:__ fluxi +* __Google Nexus 4:__ ciwrl +* __Google Nexus 5:__ ciwrl +* __Google Nexus 5X:__ ciwrl, jakew02 * __Google Nexus 6:__ dhacker29 +* __Google Nexus 6P:__ ciwrl, dhacker29, Sam Mortimer * __Google Nexus 7:__ burnsra, fattire, Thömy, nemith, JoeyRizzoli (GSM) -* __Google Nexus 10:__ atinm, dalingrin, kornyone, gweedo767 +* __Google Nexus 9:__ simonsickle, ciwrl +* __Google Nexus 10:__ Tortel, ciwrl * __Google Nexus Player:__ dhacker29, bmc08gt * __HTC Desire 601(zara/zaracl):__ uberlaggydarwin, PatrikKT * __HTC Desire 816:__ Grarak, v_superuser @@ -32,7 +35,7 @@ Maintainers (CyanogenMod 13.0): * __HTC One M8:__ deck, h8rift, invisblek, toastcfh, u-ra, uberlaggydarwin * __HTC One M8 Dual SIM (m8dug):__ bgcngm * __HTC One M9 (hima):__ cyanogen, Rashed97, varunchitre15 -* __HTC One Max (T6):__ flyhalf205, sbrissen +* __HTC One Max (T6):__ Flyhalf205 * __HTC One (Sprint):__ kushdeck, toastcfh * __HTC One (Verizon):__ flyhalf205, mdmower * __HTC One S:__ intervigil, xkonni -- cgit v1.1 From f0a6f1ec8bb78d53cb8f3f1e5ac8037e16d2e0c6 Mon Sep 17 00:00:00 2001 From: herriojr Date: Mon, 18 Jan 2016 10:32:36 -0800 Subject: Fixed mmm For Maven APK Maven APK (Why are these in maven anyways?) will crash due to it not needing to generate a jack file. This wasn't noticed before as brunch succeeded, however, doing an mmm on one will cause this to fail. This adds in logic to not generate a jack file for an apk in maven. Change-Id: I44036bfd51ae3edd9437b153898b419ffc6ba2d6 --- build/core/maven_artifact.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/core/maven_artifact.mk b/build/core/maven_artifact.mk index 5f6a2a1..3f8e7fd 100644 --- a/build/core/maven_artifact.mk +++ b/build/core/maven_artifact.mk @@ -51,6 +51,7 @@ $(LOCAL_PREBUILT_MODULE_FILE): @echo -e ${CL_GRN}"Download:"${CL_RST}" $@" ifneq ($(filter-out disabled, $(LOCAL_JACK_ENABLED)),) +ifneq ($(LOCAL_MAVEN_PACKAGING),apk) # This is required to be defined before the LOCAL_MODULES target below gets defined, it's a NOOP registered again in # BUILD_PREBUILT. This is done because BUILD_PREBUILT doesn't actually handle generating the .jack files properly and # only generates a target but doesn't set the LOCAL_MODULE dependent on it. @@ -59,9 +60,10 @@ $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON): # This adds another step required for LOCAL_MODULE to be completed -- generating the jack file, it just so happens # to be built when doing a brunch, but not when doing an mmm, so this makes it work with both $(LOCAL_MODULE): $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON)/classes.jack +endif # LOCAL_MAVEN_PACKING is not apk endif # LOCAL_JACK_ENABLED is full or partial include $(BUILD_PREBUILT) # the "fetchprebuilts" target will go through and pre-download all of the maven dependencies in the tree -fetchprebuilts: $(LOCAL_PREBUILT_MODULE_FILE) \ No newline at end of file +fetchprebuilts: $(LOCAL_PREBUILT_MODULE_FILE) -- cgit v1.1 From 67f9e7adaa57b306866fb642d99aae3da3ac7fab Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Mon, 18 Jan 2016 10:52:39 -0800 Subject: vendor/cm: Bump cmsdk platform version. Change-Id: I5f460fd94e9e85003d6d7dac58c42d5d3d31a742 --- config/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/common.mk b/config/common.mk index 39de5ee..03d90e3 100644 --- a/config/common.mk +++ b/config/common.mk @@ -332,7 +332,7 @@ ifndef CM_PLATFORM_SDK_VERSION # the SDK are released. It should only be incremented when the APIs for # the new release are frozen (so that developers don't write apps against # intermediate builds). - CM_PLATFORM_SDK_VERSION := 4 + CM_PLATFORM_SDK_VERSION := 5 endif ifndef CM_PLATFORM_REV -- cgit v1.1 From 580bc0afa288450dcba71609173886cbc94166b4 Mon Sep 17 00:00:00 2001 From: Dave Kover Date: Tue, 19 Jan 2016 17:35:38 -0800 Subject: Add new default wallpaper for CM13 Some cotton candy to go with that serving of Marshmallow. Change-Id: Ia98397a63aa2157421c777036e997b600374cf9a Ticket: CYNGNOS-1494 --- .../res/res/drawable-hdpi/default_wallpaper.jpg | Bin 0 -> 347498 bytes .../res/res/drawable-nodpi/default_wallpaper.jpg | Bin 95081 -> 257014 bytes .../drawable-sw600dp-nodpi/default_wallpaper.jpg | Bin 405943 -> 919683 bytes .../drawable-sw720dp-nodpi/default_wallpaper.jpg | Bin 405943 -> 919683 bytes .../res/res/drawable-xhdpi/default_wallpaper.jpg | Bin 209247 -> 634419 bytes .../res/res/drawable-xxhdpi/default_wallpaper.jpg | Bin 580160 -> 1585802 bytes .../res/res/drawable-xxxhdpi/default_wallpaper.jpg | Bin 0 -> 2110716 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg create mode 100644 overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg new file mode 100644 index 0000000..aab9812 Binary files /dev/null and b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg index fd919d2..a9d2b27 100644 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg and b/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg index 57e21f2..4c6dbda 100644 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg and b/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg index 57e21f2..4c6dbda 100644 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg and b/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg index 2791f5b..e50054a 100644 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg and b/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg index 90f40b4..ef645fe 100644 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg and b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg new file mode 100644 index 0000000..1e56ad8 Binary files /dev/null and b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg differ -- cgit v1.1 From 8c780755f2ce005de4a7391d8ca142149861ca68 Mon Sep 17 00:00:00 2001 From: Jani Lusikka Date: Sat, 16 Jan 2016 00:04:18 +0200 Subject: Grant platform apps access to /mnt/media_rw with sdcard_posix label Also allow apps to read the contents of mounted OBBs. See AOSP Change-Id: I66df236eade3ca25a10749dd43d173ff4628cfad and Change-Id: I49b722b24c1c7d9ab084ebee7c1e349d8d660ffa Change-Id: I757a2a8831c69d41c0496025a39eaf79ceb0e65f --- sepolicy/app.te | 5 +++++ sepolicy/platform_app.te | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 sepolicy/platform_app.te diff --git a/sepolicy/app.te b/sepolicy/app.te index 761eb5f..e590efe 100644 --- a/sepolicy/app.te +++ b/sepolicy/app.te @@ -1,3 +1,8 @@ +# Access OBBs (sdcard_posix) mounted by vold +# File write access allowed for FDs returned through Storage Access Framework +allow appdomain sdcard_posix:dir r_dir_perms; +allow appdomain sdcard_posix:file rw_file_perms; + # Themed resources (i.e. composed icons) allow appdomain theme_data_file:dir r_dir_perms; allow appdomain theme_data_file:file r_file_perms; diff --git a/sepolicy/platform_app.te b/sepolicy/platform_app.te new file mode 100644 index 0000000..db8647d --- /dev/null +++ b/sepolicy/platform_app.te @@ -0,0 +1,4 @@ +# Direct access to vold-mounted storage under /mnt/media_rw +# This is a performance optimization that allows platform apps to bypass the FUSE layer +allow platform_app sdcard_posix:dir create_dir_perms; +allow platform_app sdcard_posix:file create_file_perms; -- cgit v1.1 From 0921d1f11fb9c42c878a8ca190998697c16b17dd Mon Sep 17 00:00:00 2001 From: Brinly Taylor Date: Sun, 29 Nov 2015 03:22:33 -0800 Subject: vendor: cm: Update maintainers. AdrianDC also in the crew now while Marcelo doesn't have the device anymore. This patch was requested by AdrianDC. Change-Id: I57a27655537d96c7f5dc33f33d8e7d7e3982d6db --- CONTRIBUTORS.mkdn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index 81b353d..484bc95 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -139,7 +139,7 @@ Maintainers (CyanogenMod 13.0): * __Sony Xperia L (taoshan):__ olivieer, FreeXperia Team * __Sony Xperia M (nicki):__ RonG, FreeXperia Team * __Sony Xperia M2 (eagle):__ FreeXperia Team -* __Sony Xperia SP (huashan):__ Mrcl1450 +* __Sony Xperia SP (huashan):__ AdrianDC * __Sony Xperia T (mint):__ FreeXperia Team, tilal6991, uberlaggydarwin * __Sony Xperia T2 Ultra (tianchi):__ FreeXperia Team * __Sony Xperia T3 (seagull):__ FreeXperia Team -- cgit v1.1 From 86020c90661be88e09b1132fded7018ce259bd4d Mon Sep 17 00:00:00 2001 From: Jason Riordan Date: Sun, 24 Jan 2016 14:52:33 -0500 Subject: Add Zenfone 2 maintainers, update a few others Change-Id: I35499bc5bdbdd11ddcb37d6715b5b3f9c7f5d637 --- CONTRIBUTORS.mkdn | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn index 484bc95..e4d5476 100644 --- a/CONTRIBUTORS.mkdn +++ b/CONTRIBUTORS.mkdn @@ -11,6 +11,8 @@ Maintainers (CyanogenMod 13.0): * __Asus EeePad Transformer Pad TF300T:__ chrmhoffmann * __Asus EeePad Transformer Pad Infinity TF700T:__ dasunsrule32 * __Asus EeePad Transformer Pad TF701T:__ pershoot +* __Asus Zenfone 2 ZE550ML (Z008):__ crpalmer, jrior001 +* __Asus Zenfone 2 ZE551ML (Z00A):__ crpalmer, jrior001 * __B&N NookColor (encore):__ eyeballer, fattire, keyodi, krylon360, sluo (NookieDevs) * __B&N Nook Tablet (acclaim):__ chrmhoffmann * __Google Android One:__ varunchitre15 @@ -41,7 +43,7 @@ Maintainers (CyanogenMod 13.0): * __HTC One S:__ intervigil, xkonni * __HTC One X:__ gorbi16, mdeejay, tbalden, Thömy * __HTC One X+:__ Lloir, tombriden -* __HTC One XL:__ h8rift, intervigil +* __HTC One XL:__ h8rift, intervigil, jrior001 * __LG G2 (AT&T) (D800):__ arcee, Rashed97, Shelnutt2 * __LG G2 (T-Mobile) (D801):__ arcee, Rashed97, Shelnutt2 * __LG G2 (International) (D802):__ arcee, Rashed97, Shelnutt2 @@ -85,7 +87,7 @@ Maintainers (CyanogenMod 13.0): * __Oppo Find 5:__ intervigil, nebkat, raymanfx * __Oppo Find 7:__ intervigil, tdm, inwotep, mikeioannina * __Oppo N1:__ raymanfx -* __Oppo N3:__ invisiblek, maniac103 +* __Oppo N3:__ jrior001 * __Oppo R7:__ maniac103, mikeioannina, Rashed97 * __Oppo R7 Plus:__ maniac103, mikeioannina, Rashed97 * __Samsung Captivate (SGH-I896 / SGH-I897):__ pawitp @@ -129,6 +131,7 @@ Maintainers (CyanogenMod 13.0): * __Samsung Galaxy S IV Mini LTE (GT-I9195):__ arco * __Samsung Galaxy S V (AU) (SCL23):__ scoty755 * __Samsung Galaxy S V (Vodafone) (SM-G900I):__ Regi24 +* __Samsung Galaxy S V LTE (SM-G900F):__ Albinoman887 * __Samsung Galaxy Tab 7" (GSM):__ cdesai, humberos * __Samsung Galaxy Tab 7" (CDMA):__ jt1134 * __Samsung Galaxy Tab 2 7" (GT-P31xx):__ codyf86 -- cgit v1.1 From db4fb0ee6b7396c31a016ae9975892d26ed719f3 Mon Sep 17 00:00:00 2001 From: Pat Erley Date: Tue, 12 Jan 2016 17:46:52 -0800 Subject: recovery: Add new rules for recursive wipe We now use a temporary context when mounting /data, so add permissions to do that, and add permissions necessary to do the recursive wipe. Change-Id: Ic925c70f1cf01c8b19a6ac48a9468d6eb9205321 --- sepolicy/recovery.te | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te index e2efee4..76e7a62 100644 --- a/sepolicy/recovery.te +++ b/sepolicy/recovery.te @@ -30,6 +30,10 @@ allow recovery sdcard_posix:file r_file_perms; allow recovery recovery_prop:property_service set; # recursive rm for wipes... :( +allow app_data_file self:filesystem associate; +allow recovery app_data_file:file { read open create write }; +allow recovery app_data_file:filesystem { relabelto relabelfrom mount unmount }; + allow recovery file_type:dir { rw_dir_perms rmdir }; allow recovery file_type:notdevfile_class_set { unlink getattr }; # wipe saves and restores the layout version -- cgit v1.1 From 92a49a949d073e0f1e3aae4c1becb75a8113b307 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Fri, 29 Jan 2016 11:50:41 -0600 Subject: apns: T-Mobile 310260: Compatibility update * Allow both IPv4 and IPv6 protocols for data and mms * Provide an apn name for the initial attach profile With respect to initial attach, it seems at least the qcom ril blobs on my device require the apn field to be set. The following error is produced and data will not connect on boot unless radio resets (e.g. airplane mode toggle) so that the default APN is used. E RILQ : (0/231): RIL[0][cmd-111(680)] qcril_data_request_set_lte_attach_profile: ril_apn (provided NULL) is mandatory param for looking up profile. E RILQ : (0/231): RIL[0][cmd-111(680)] qcril_data_request_set_lte_attach_profile: EXIT with FAILURE E RILQ : (0/231): RIL[0][cmd-111(680)] qcril_qmi_nas_set_initial_attach_apn: Data RIL call for Attach APN failed with Error code 2 Change-Id: Ie983474780a7443c870911994234ea2f2025de12 --- prebuilt/common/etc/apns-conf.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml index b8e659e..2741c6a 100644 --- a/prebuilt/common/etc/apns-conf.xml +++ b/prebuilt/common/etc/apns-conf.xml @@ -1471,9 +1471,9 @@ - - - + + + -- cgit v1.1 From 144291005ddf8654a298467d22b71f83fdf3cffc Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Sat, 30 Jan 2016 12:21:39 -0600 Subject: apns: Cricket AIO 310150: Remove duplicate Change-Id: I7f68a8bb531e02fe74971565a425327e79a70604 --- prebuilt/common/etc/apns-conf.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml index 2741c6a..753257d 100644 --- a/prebuilt/common/etc/apns-conf.xml +++ b/prebuilt/common/etc/apns-conf.xml @@ -1460,7 +1460,6 @@ - -- cgit v1.1 From 34b5b9756cdc86ab9491938c8519b7ae8beecb6d Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 30 Jan 2016 23:39:39 +0200 Subject: cm: Add live lockscreen feature Change-Id: I62e5229c9688619c2f7809f001d761b4bdf13a10 --- config/common.mk | 4 ++++ .../permissions/org.cyanogenmod.livelockscreen.xml | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 config/permissions/org.cyanogenmod.livelockscreen.xml diff --git a/config/common.mk b/config/common.mk index 03d90e3..0b900d0 100644 --- a/config/common.mk +++ b/config/common.mk @@ -121,6 +121,10 @@ 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 diff --git a/config/permissions/org.cyanogenmod.livelockscreen.xml b/config/permissions/org.cyanogenmod.livelockscreen.xml new file mode 100644 index 0000000..1d09d4f --- /dev/null +++ b/config/permissions/org.cyanogenmod.livelockscreen.xml @@ -0,0 +1,20 @@ + + + + + + + -- cgit v1.1