Revert "QuickSettings : Register/unregister cast tile one time"

This reverts commit 27deba50e5148e9a04dd54437af4d8788366794c.

Change-Id: I19d9c0fe1d1bca52b7a6e1183ad2d3c3a83d29b3
Themes: Fix icon filters clamping to wrong values

Change-Id: Iab3cce465f8bdfd7c30a020fda254728349c5ebe
Merge "Themes: Fix icon filters clamping to wrong values" into kitkat3
NFC Polling Mode (3/3)

Change-Id: I41c76e6f23642af3daf356daf3788387b396594f
Merge "NFC Polling Mode (3/3)" into kitkat3
Themes: Make sure composed icon info is meaningful

We don't want to try and create a composed icon if the parts that
make up a composed icon are not valid or set.

Conflicts:
	core/java/android/content/res/Resources.java

Change-Id: I699a98e548e848e05d58e31985dcd2c836470fe7
Merge "Themes: Make sure composed icon info is meaningful" into kitkat3
Over scroll effects [1/2]

Change-Id: I4cc67715f8f3bc67674782f08b9e363ee0e8ac9e
Merge "Over scroll effects [1/2]" into kitkat3
SystemUI: add missing status bar image

PS: resize to hdpi

Change-Id: I5c3218a8e819e8c047d5e2371d866bfd97a2e0fe
Merge "SystemUI: add missing status bar image" into kitkat3
Revert "[View] Clear Hardware-Layers before system destroys HardwareRenderer​."

This reverts commit 6039044f76f8f4b360144c6450d9fc0e0d4378d7.

Change-Id: I13e5626de8cf4c358db7676540e952053d6e0118
Merge "Revert "[View] Clear Hardware-Layers before system destroys HardwareRenderer​."" into kitkat3
Fix Power Shutter Exception 2 of 2

Set protection level to 'dangerous'

Change-Id: I9792f4c543c9ce8a647989ca60cdc9389602551c
Move idmap to frameworks/base [2/2]

idmap depends on libandroidfw, so it should go in frameworks/base.
This follows AOSP which moved idmap to frameworks/base back in
February of 2014.

Change-Id: Ice308a5299a69fd1fbc084a7c76a317c7dec3689
Convert all selinux_android_restorecon and _setfilecon calls to new API.

libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.

Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.

Change-Id: Iecc2aeafe87fe43f1554b92f7fe77a2aa2d1b771
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Themes: Load missing style attributes from original style

If a theme overrides a style in an app and does not include all
the attributes found in the original, it is possible for the app
to crash because it cannot locate an attribute it is expecting.

To overcome this we need to check the attributes in the original
style's bag and add any missing attributes to the current bag being
populated.  Currently we have only seen one theme that causes this
behavior, but there could be others out there or we may eventually
see this happen in the wild as apps update and the themes have not
had a chance to incorporate the new additions from the app.

Change-Id: Id44aa83a6c58a0b042d2b32171bed5e794352670
Themes: Avoid NPE when setting text in TickerView

It is possible, with the right timing, to receive an NPE in TextSwitcher
when a notification comes in during recreation of the status bar because
of a theme change.

Change-Id: Ia35ad0346f232df905ecff69158b71f3bf61a163
EncoderCapabilities: Adding HFR entry in EncoderCapabilities and JNI

--Adding HFR entries like max HFR mode, max HFR width & max HFR height
  in the EncoderCapabilities.java and android_media_MediaProfiles.cpp

Change-Id: I544a17e32ddd7ddccb0c48cf07b3199d2c485e09
CRs-Fixed: 589983
Bluetooth: Add Total track number.

Add support to add total number of tracks in
Meta-data

Change-Id: I5b1287f791615adcd4f920fe5c7cae0c7c7b04ea
CRs-Fixed: 627869