What the f?
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I2c171d55a9a51f202980ab4fbcc9376a587aea1a
what the f?
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I11cdd1d0cbb91127e2bc15e8aea2c93b73a69830
Frameworks: activate PIE on lockscreen apps

currently the situation was that every application started on
lockscreen had disabled pie (because lockscreen disables it). Downside
on incoming call or camera widget the user did not have a navigation.
As well on unsecure lockscreen the user could not navigate further

this commit fixes this behaviour

Change-Id: Ie1aebdc84d1ce075ebaa09dfffd080f38c652b13
Frameworks: merge derp....add back Less Notification Sounds feature

still no idea how this could happen. Whatever add the removed part
back

cheers

Change-Id: I28a865d033dbccd74aae4a0070022adbce19d56d
fix HALO silence bug when notification is dismissed
halo, wrong touch calculation, nap trigger fixed

Change-Id: Ib09163d71cddb2cbe8f375313e0c1e03b37fd504
halo, still wrong multitouchhandling

Change-Id: Id9c00c25add4a493309f170eb97acf0a06c378d0
halo, fancy flip

Change-Id: I364e63c1ad15caf8ed469a49862a533044583855
halo, flip for incoming messages

Change-Id: If54cbd39eb926f6f78db04608ba72c3ff0c356fc
Protected lockscreen - do not ping on unlock if silenced
halo performance, batch revamp

Change-Id: Ic32c146a1e4753c5a3342831d6c719a654816e54
code cleanup

Change-Id: I7af612c13aff48d0d20a0e8f83ea43c8941dcaaf
Revert "what the f?"

This reverts commit e66d3397f5f35bc8743b3dc5f6c4e5c74847a98d.
Revert "What the f?"

This reverts commit ee851c62b1b38702d8efdfa6fbd3d216b8c6d74d.
Minor post-merge cleanup.

Change-Id: Ic65ef882b61aa6506d21bbe41b9ac8473a950591
Treat default value that wasn't found as empty value.

Fixes http://code.google.com/p/android/issues/detail?id=33220

Change-Id: If22e8b245f688d922c168aa54c8acf743c0644d7
StorageManager: fix android.process.media process stop while plug a discontinuous partitioned SD Card

While get volume state, throw an IllegalArgumentException, catch
this exception in StorageManager and return null to MtpService to
avoid process stoping.

Change-Id: Iebb5c38e375d3f54505d9b9d64fcd0f02a2b60c1
Author: Li Gang <gang.g.li@intel.com>
Signed-off-by: Li Gang <gang.g.li@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 47459
merge android-4.3_r2.2 into jb.4.3

Change-Id: Ia7a8df7c4582d43000723c33c7e6b81682214b54
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	services/java/com/android/server/NotificationManagerService.java
Revert "Reduce total number of background apps for low memory devices"

This reverts commit 82289c1ec2c3d1767b3baeb309a2044a2ad3d405.

Change-Id: Ic4ef44c9219030041a5436bab74fce9ce7c8879c
am: Allow more hidden apps on devices with lots of RAM

 * If more than 1.5GB is present, allow up to 40 hidden apps.
 * Number is somewhat arbitrary, but was found to work well on D2.
 * Also look at the sys.mem.max_hidden_apps value if given.

Change-Id: I2d3cf6e0dad1bc0b482cc37bf9c61ed2f2b4be51