Merge "sepolicy: allow vold to mount fuse-based sdcard" into cm-11.0
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 05df1a7..47f560a 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -1,15 +1,27 @@
CyanogenMod
===============
-Visit http://github.com/CyanogenMod for full changelogs and git access.
+Visit http://github.com/CyanogenMod for full source and git access.
Visit http://review.cyanogenmod.org for our Gerrit instance.
CHANGELOG (notable new features)
---------
+### 11.0.0
+* Common: Android 4.4 (Google)
+
### 10.2.0
* Common: Android 4.3 (Google)
+* Common: Privacy Guard 2.0 with AppOps
+* Common: Quick Settings Ribbon (replaces Notification Power Widgets)
+* Common: Hardware Tunables HAL
+* Common: Settings restructure
+* SMS: Voice+ (Google Voice integration)
+* SMS: Middleware layer
+* APN: World Phone Support (unified APN list)
+* Trebuchet: Universal Icon Pack support
+* Various small bugfixes, global and device-specific
### 10.1.3
* Common: CyanogenMod Account
@@ -228,164 +240,3 @@
* Supersonic: WiMAX support - HTC, Shinzul, toastcfh, shift, #teamwin, Cyanogen, Joey Conway
* Supersonic: HDMI mirror support: #teamwin
* ONE: Enabled native WiFi tethering - arcee
-
-### 6.1.3
-* Ace: Fix issue with some BT Headset
-
-### 6.1.2
-* Ace: Kernel to 2.6.32.27 and some performance tweaks
-
-### 6.1.1
-* Common: Add rotary lockscreen - Kmobs/Robert Burns
-* Common: Updated translations - (everyone)
-* Common: Push update notificatiosn - Chris Soyars
-* Common: Fix camera sounds - CAF/Cyanogen/mtwebster
-* N1/DS/Supersonic/Bravo(c): Kernel performance tweaks and fixes (various)
-* N1: Update build fingerprint
-* Vision: Fix MMS over WiFi calling - Zinx
-* Vision: Add console=null to kernel command line - Adam Tygart
-* Vision: Kernel to 2.6.32.27 and some performance tweaks
-* Droid: FRG83D fingerprint, translations, camera, torch fixes
-
-### 6.1.0
-* Common: Update to Android 2.2.1
-* Common: Various bugfixes from AOSP and CodeAurora
-* Common: ADWLauncher 1.3.3 - Ander Webbs
-* Common: Configurable audio focus for music app - Jonas Larsson
-* Common: APN cleanup (fixes many issues with GPS and MMS) - Cyanogen
-* Common: Use ARMv6 optimizations for DS/Hero targets - Ninpo
-* Common: AudioDSP updates - Antti S. Lankila
-* Common: Status bar themes - Michael Webster
-* Common: Email app updates** - Michael Webster
-* Common: Selected kernel optimizations - Kernelzilla
-* Common: EMMC support - Koush
-* Common: Camcorder touch-to-focus - Cyanogen
-* Common: Notification "quiet hours" - Evan Charlton
-* Common; Superuser 2.3.6 - Adam Shanks (ChainsDD)
-* Common: Camera/camcorder continuous autofocus - Cyanogen
-* Common: Camera option sliders - Cyanogen
-* Common: Control locking of MMS app in memory - Julian J. M
-* Common: Kill foreground app by long-pressing back - Evan Charlton
-* Common: New AppWidgetPicker dialog - boombuler@XDA
-* Common: FileManager app - OpenIntents (graphics update from Fitsnugly)
-* Common: Anonymous install statistics gathering - Chris Soyars
-* Common: Stable shot camera mode - Cyanogen
-* Common: Dual-mode snooze (long press dismiss) - Evan Charlton
-* Common: Compose SMS/MMS via search button long press - Wes Garner
-* Common: Notification category support - Pedlar
-* Common: Galaxy S style power widget in notification bar - Pedlar
-* Common: Autodetect if we should use /cache for system dex files - Kali-
-* Common: Quick PIN unlock - gsarrica
-* Common: Increase performance of Gallery3D caching system - Androbot
-* Common: Gallery3D bugfixes and improvements - CodeAurora
-* Common: Gallery3D highres patches - Petar Šegina
-* Common: Skia performance enhancements - CodeAurora
-* Common: APN list update - Paul Weiss
-* Common: Fix AGPS issues on all platforms
-* Common: Ability to customize location to save attachments in MMS - Wes Garner
-* Common: Dismiss notifications by swiping - Evan Charlton
-* Common: Enabled Sound Recorder app
-* Common: Bluetooth OBEX performance boost - Sony
-* Common: Updated Terminal Emulator app - Jack Palevich
-* Common: Updated headset drawables - blunden
-* Common: Optional overscrolling - Google, arcee, Robert Burns
-* Common: Messaging/Phone sliders on lockscreen - Rodolfo Hurtado
-* Common: Lockscreen gestures - Michael Webster
-* Common: Camera bugfixes (mostly for Droid) - Michael Webster
-* Common: Bluetooth FTP server profile - CodeAurora
-* Common: New wallpapers - Prash
-* Common: Super duper unified flashlights - Michael Webster
-* Common: Launch applications via DeskClock - Evan Charlton
-* N1/Bravo/Incredible/Supersonic/Vision/Ace: FM Radio support - MIUI - http://miui.com (graphics from Fitsnugly, HaXzAmaTiC, and blunden - bugfixes and extra features from Cyanogen, Zinx, mtwebster, and Wysie))
-* N1/DS/Bravo(c)/Supersonic - Unified kernel (Cyanogen, toastcfh, Kali-, defer, Zinx, ezterry, Pershoot, and others)
-* N1: Increased camera performance - Charan Singh
-* N1: Enhanced battery driver - Roger Podacter, theloginwithnoname
-* DS: Updated hardware drivers from official release
-* DS: CompCache sizes can be adjusted through CMParts - Wes Garner
-* DS: Removed bootloader/radio asserts - GOOD LUCK
-* Supersonic - Kernel 2.6.34 courtesy of Toast and Madcoder
-* Supersonic - Use WiMAX LED for notifications - Cyanogen
-* Bravo: Kernel merged with cm-kernel - Kali, Defer
-* Espresso: Improve backlights - Wes Garner
-* Espresso/Legend/Liberty: Kernel OC patch - dumfuq (no OC by default)
-* Espresso/Legend/Liberty: Using media libs from 2.2
-* Espresso: Fixed Bluetooth SCO
-* Legend/Supersonic: Proper notification light support - Alex Hofbauer
-* Incredible: Enable torch app
-* Incredible: Better internal storage support - Josh Stone
-* Sholes: Enable Torch app - mtwebster
-* Vision: Kernel 2.6.32.26, many improvements, 1.4GHz capable (coolbho3k), new ganeth driver (zinx)
-* Vision: Quickeys implementation - Optedoblivion
-* Vision: Insane GPS fix - Zinx
-* Vision: LED enhancement - Pershoot
-* Droid: Kernel 2.6.32.9
-
-### 6.0.0
-* ANDROID: Google, HTC, Qualcomm, and everybody else. We <3 U
-* Common: ADWLauncher 1.1.4 - Ander Webbs
-* Common: Music app enhancements - Eliot Stocker
-* Common: Phone mod V.30.1 - cytown
-* Common: WyContacts 1.2 - Wysie (port to Froyo by Sileht)
-* Common: Superuser 2.3.3 - Adam Shanks (ChainsDD)
-* Common: Deskclock extra settings - cyanogen, Michael Webster
-* Common: MMS enhancements from Ruqqq, Takuo Kitame, jeagoss, temporalshadows
-* Common: Improved RTL text rendering - David Kohen, Omri Baumer
-* Common: Themable user interface elements - Wysie, bcrook, jeagoss
-* Common: FLAC playback support - Kenny Root, Cyanogen, Glenn Maynard
-* Common: Lockscreen enhancements - Wysie
-* Common: Long-press home options - Wysie, bcrook
-* Common: OpenVPN support - James Bottomley, Takuo Kitame
-* Common: Br0tips - Kmobs
-* Common: Browser incognito mode - Optedoblivion
-* Common: Zipalign on install (if needed) + system dex cache to /cache - Cyanogen/Chris Soyars
-* Common: Customizable Nexus LWP - Chris Soyars/Cyanogen
-* Common: JIT toggle, configurable heapsize, compcache supprt - Cyanogen
-* Common: Adjustable haptic feedback - Michael Webster
-* Common: Custom wallpapers - jairomeo, prash, SatanR1
-* Common: Battery percentage display - canadiancow, jeagoss
-* Common: Trackball wake, trackball unlock, menu unlock - Jon Boekenoogen/Kmobs
-* Common: Surfaceflinger night mode and effects - Jeff Sharkey, widget from Wysie
-* Common: Reflow webviews on pinch option - Jonas Larsson
-* Common: Enhanced accelerometer settings - Jonas Larsson
-* Common: A2DP bugfixes - Glenn Maynard
-* Common: Browser fullscreen mode and other enhancements - Wysie
-* Common: Major build system enhancements by Chris Soyars & Koush
-* Common: Long press volume buttons to skip songs - Jon Boekenoogen
-* Common: Accelerated ARMv7 JPEG and PNG decoding - Qualcomm
-* Common: Skia acceleration on ARMv7 - Qualcomm
-* Common: Patch wrangling - Cyanogen, Chris Soyars, Koush, Kmobs
-* Common: Bluetooth HID support - Erin Yueh @ 0xlab
-* Common: Mouse pointer support - Chih-Wei Huang (android-x86)
-* Common: Configurable install location + allow move any app to external storage - Cyanogen
-* Common: Busybox and rsync Android ports from Dylex
-* Common: nano, and libncurses are now built from source. - cvpcs
-* Common: Dual camera support - Cyanogen
-* Common: Support for HTC camera firmware with extra features - Cyanogen, Qualcomm
-* Common: Other camera enhancements - Cyanogen
-* Common: Customizable status bar - Michael Webster
-* Common: Lockscreen music controls - Kmobs
-* Common: "Roam Only" mode - jrgutier
-* Common: Mobile data toggle for power widget - Drakaz
-* Common: Exchange support fixes and volume rocker selection - Michael Webster
-* Common: Lock home app in memory option - Cyanogen
-* Common: Audio DSP support (equalizer, virtual room, compressor effects) - Antti S. Lankila
-* Common: Customizable trackball notifications - Pedlar
-* Common: Fully customizable power widget - piafinho
-* Common: Zoom (except in 720p), flash, and other camera parameters can be changed while recording - Cyanogen, Qualcomm
-* Common: New boot animation by 73v1n: http://www.youtube.com/watch?v=LnweaNTtb1k
-* Common: Arabic language support - Aziz Huss, David Kohen
-* Common: Torch app - Ben Buxton, Cyanogen
-* Common: Browser color invert (save battery on AMOLED screens) - Qualcomm
-* Common: Configurable brightness sensor - Jonas Larsson
-* Common: Ad-Hoc wifi support - Petr Havlena
-* Common: Audio focus enhancements - Jonas Larsson
-* Common: Mail folder sync settings - Michael Webster
-* N1/DS/Desire: Kernel 2.6.34.4 with Pershoot/Kmobs clock settings
-* D/S: Camera reverse engineering by NCommander, Eddie Ringle, & Cyanogen
-* D/S: Kernel patches for stability from Zinx Verituse
-* D/S: MT3G Fender/1.2 support from Zinx Verituse
-* D/S: Better media profiles - Charan Singh
-* EVO: Kernel base from toastcfh, display patches from AssassinsLament and netarchy, backport of various features from Cyanogen (2.6.32)
-* EVO: Sprint MMS fixes - Darchstar, toastcfh
-* N1/Desire: True 720P encoding support - HTC, Cyanogen, Charan Singh, Enomther
-* Desire: Kernel base from Kali- & Defer
diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index c3bdaa8..356790e 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -1,14 +1,14 @@
CyanogenMod
===========
-Maintainers (CyanogenMod 10.2):
+Maintainers (CyanogenMod 11.0):
-----------------------------
* __Acer A700:__ pawitp
* __Amazon Kindle Fire 1st Edition:__ Hashcode
* __Amazon Kindle Fire 2nd Edition:__ Hashcode
* __Asus EeePad Transformer (TF101):__ Bumble-Bee, EnJens
* __Asus EeePad Transformer Prime (TF201):__ Bumble-Bee, EnJens
-* __Asus EeePad Transformer Pad TF300T:__ xplodwild
+* __Asus EeePad Transformer Pad TF300T:__
* __Asus EeePad Transformer Pad Infinity TF700T:__ dasunsrule32
* __B&N NookColor (encore):__ eyeballer, fattire, keyodi, krylon360, sluo (NookieDevs)
* __Google Galaxy Nexus:__ , bekit, Bumble-Bee, burnsra, KalimochoAz, something15525
@@ -42,11 +42,12 @@
* __Motorola Xoom (WiFi):__ bazar, SteadyHawkin, TDR (Team Rogue)
* __Motorola Xoom 3G (UMTS):__ bazar, SteadyHawkin, TDR (Team Rogue)
* __Motorola Xoom 4G LTE (Verizon):__ bazar, SteadyHawkin, TDR (Team Rogue)
+* __Oppo Find 5__: nebkat
* __Samsung Captivate (SGH-I896 / SGH-I897):__ pawitp
* __Samsung Epic 4G (SPH-D700):__ bbelos
* __Samsung Exhilarate (SGH-I577):__ mikeyman77, carvsdriver
* __Samsung Fascinate / Mesmerize (SCH-I500):__ jt1134, sbrissen
-* __Samsung Galaxy Note (GT-N7000):__ Entropy512, Espenfjo
+* __Samsung Galaxy Note (GT-N7000):__ Espenfjo
* __Samsung Galaxy Note II (GT-N7100):__ nebkat
* __Samsung Galaxy Note II LTE (GT-N7105):__ codeworkx
* __Samsung Galaxy Note II LTE (AT&T) (SGH-I317):__ codeworkx, cyanogen
@@ -54,7 +55,9 @@
* __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 10.1 (GT-N80XX):__ Entropy512, Espenfjo
+* __Samsung Galaxy Note 8.0 3G (GT-N5100):__ sbrissen
+* __Samsung Galaxy Note 8.0 Wifi (GT-N5110):__ sbrissen
+* __Samsung Galaxy Note 10.1 (GT-N80XX):__ Espenfjo
* __Samsung Galaxy Note 10.1 LTE (Verizon) (SCH-I925):__ sbrissen
* __Samsung Galaxy R (GT-I9103):__ Adam77Root, Epsylon3
* __Samsung Galaxy S Blaze 4G (SGH-T769):__ UberPinguin
@@ -62,12 +65,12 @@
* __Samsung Galaxy S (GT-I9000B):__ helvio88
* __Samsung Galaxy S II (T-Mobile) (SGH-T989):__ mikeyman77
* __Samsung Galaxy S II (AT&T) (SGH-I727):__ topprospect
-* __Samsung Galaxy S II (AT&T) (SGH-I777):__ Entropy512
+* __Samsung Galaxy S II (AT&T) (SGH-I777):__
* __Samsung Galaxy S II (intl) (GT-I9100):__ codeworkx, Espenfjo
* __Samsung Galaxy S II (intl) (GT-I9100G):__ codeworkx
* __Samsung Galaxy S III (AT&T) (SGH-I747):__ cyanogen
* __Samsung Galaxy S III (Cricket) (SCH-R530):__ noobnl
-* __Samsung Galaxy S III (intl) (GT-I9300):__ xplodwild, codeworkx
+* __Samsung Galaxy S III (intl) (GT-I9300):__ codeworkx
* __Samsung Galaxy S III LTE (GT-I9305):__ mcampbellsmith, codeworkx
* __Samsung Galaxy S III (MetroPCS) (SCH-R530):__ noobnl
* __Samsung Galaxy S III (Sprint) (SPH-L710):__ mkasick, noobnl
@@ -90,11 +93,11 @@
* __Sony Xperia SP (huashan):__ jerpelea, Kali- (FreeXperia team), adfad666, uberlaggydarwin
* __Sony Xperia T (mint):__ jerpelea, Kali- (FreeXperia team), codeworkx, cdesai, tilal6991
* __Sony Xperia V (tsubasa):__ jerpelea, Kali- (FreeXperia team), codeworkx, tilal6991, championswimmer
-* __Sony Xperia Z (yuga):__ jerpelea, Kali- (FreeXperia team), cdesai, codeworkx, Entropy512, championswimmer
+* __Sony Xperia Z (yuga):__ jerpelea, Kali- (FreeXperia team), cdesai, codeworkx, championswimmer
* __Sony Xperia ZL (odin):__ jerpelea, Kali- (FreeXperia team), championswimmer
* __Sony Xperia ZR (dogo):__ jerpelea, Kali- (FreeXperia team)
* __Sony Xperia Tablet Z LTE (pollux):__ jerpelea, Kali- (FreeXperia team), codeworkx
-* __Sony Xperia Tablet Z Wifi (pollux_windy):__ jerpelea, Kali- (FreeXperia team), Bumble-Bee, Entropy512
+* __Sony Xperia Tablet Z Wifi (pollux_windy):__ jerpelea, Kali- (FreeXperia team), Bumble-Bee
* __Sony Xperia Z Ultra (togari):__ jerpelea, Kali- (FreeXperia team)
* __Sony Xperia Z1 (honami):__ jerpelea, Kali- (FreeXperia team)
@@ -102,7 +105,7 @@
General developers:
-------------------
* __UI Team:__ blunden, prash
-* __UX Team:__ blunden, ciwrl, daneshm, DvTonder, mad-murdock, maniac103, Kaik541
+* __UX Team:__ blunden, ciwrl, daneshm, DvTonder, maniac103, Kaik541
* __Other:__ jruesga
Translators:
@@ -128,3 +131,14 @@
* __Slovak:__ Dusan Kazik
* __Spanish:__ Jorge Ruesga, Lorenzo M. Castaño
* __Swedish:__ Simon Bäck, Ted Lundwall, Esa Laukkanen, Björn Lundén
+
+Graphics and Assets:
+--------------------
+* __Wallpapers:__ Matthew Hanley, Henry Mason
+* __Icons:__ Bjorn Lunden, Henry Mason
+* __Bootanimation:__ Dima Skvarskyi
+
+Former Contributors:
+--------------------
+* __Devices:__ Entropy512, xplodwild
+* __Features:__ mad-murdock, wysie, Ander Webbs, ChainsDD, xplodwild
diff --git a/config/common.mk b/config/common.mk
index cae14ce..1f61780 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -3,23 +3,7 @@
SUPERUSER_EMBEDDED := true
SUPERUSER_PACKAGE_PREFIX := com.android.settings.cyanogenmod.superuser
-# To deal with CM9 specifications
-# TODO: remove once all devices have been switched
-ifneq ($(TARGET_BOOTANIMATION_NAME),)
-TARGET_SCREEN_DIMENSIONS := $(subst -, $(space), $(subst x, $(space), $(TARGET_BOOTANIMATION_NAME)))
-ifeq ($(TARGET_SCREEN_WIDTH),)
-TARGET_SCREEN_WIDTH := $(word 2, $(TARGET_SCREEN_DIMENSIONS))
-endif
-ifeq ($(TARGET_SCREEN_HEIGHT),)
-TARGET_SCREEN_HEIGHT := $(word 3, $(TARGET_SCREEN_DIMENSIONS))
-endif
-endif
-
ifneq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
-
-# clear TARGET_BOOTANIMATION_NAME in case it was set for CM9 purposes
-TARGET_BOOTANIMATION_NAME :=
-
# determine the smaller dimension
TARGET_BOOTANIMATION_SIZE := $(shell \
if [ $(TARGET_SCREEN_WIDTH) -lt $(TARGET_SCREEN_HEIGHT) ]; then \
@@ -164,7 +148,10 @@
Apollo \
CMFileManager \
LockClock \
- CMAccount
+ CMUpdater \
+ CMFota \
+ CMAccount \
+ WhisperPush
# CM Hardware Abstraction Framework
PRODUCT_PACKAGES += \
@@ -217,7 +204,6 @@
PRODUCT_PACKAGES += \
procmem \
procrank \
- CMUpdater \
Superuser \
su
@@ -230,9 +216,6 @@
persist.sys.root_access=1
else
-PRODUCT_PACKAGES += \
- CMFota
-
PRODUCT_PROPERTY_OVERRIDES += \
persist.sys.root_access=0
@@ -291,7 +274,15 @@
endif
ifeq ($(CM_BUILDTYPE), RELEASE)
- CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)
+ ifndef TARGET_VENDOR_RELEASE_BUILD_ID
+ CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)
+ else
+ ifeq ($(TARGET_BUILD_VARIANT),user)
+ CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD)
+ else
+ CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)
+ endif
+ endif
else
ifeq ($(PRODUCT_VERSION_MINOR),0)
CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD)
@@ -307,3 +298,5 @@
-include vendor/cm-priv/keys/keys.mk
-include $(WORKSPACE)/hudson/image-auto-bits.mk
+
+-include vendor/cyngn/product.mk
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 4d812a0..0236b61 100644
--- 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
Binary files differ
diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc
index e3de6b5..5b1db3b 100644
--- a/prebuilt/common/etc/init.local.rc
+++ b/prebuilt/common/etc/init.local.rc
@@ -4,7 +4,6 @@
on init
export ANDROID_CACHE /cache
export TERMINFO /system/etc/terminfo
- export TERM linux
on post-fs-data
mkdir /cache/dalvik-cache 0771 system system
