fw: media: Handle NPE due to threading race

Change-Id: I6eab5bc3d687edfa6f0839e439b3314bed4fdcea
Merge "Temporarily hide lock screen unlock targets if opening a widget" into cm-11.0
Themes: uninstallThemeForAllApps shouldn't check if map is empty if it's null

Potential NPE introduced in ec2200878706735cdd2caf4d934d988296998e85

Change-Id: I6d1ec165957c2be63086a18af2236e46978e9c8a
Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1

Signed-off-by: Arnav Gosain <nolinuxnoparty@gmail.com>

Conflicts:
	Android.mk
	core/java/android/app/ContextImpl.java
	core/java/android/app/WallpaperManager.java
	core/java/android/view/ViewConfiguration.java
	core/jni/android/graphics/Paint.cpp
	core/res/res/values-fr-rCA/strings.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/BackupManagerService.java
	services/java/com/android/server/ConnectivityService.java
	services/java/com/android/server/am/ActiveServices.java
	services/java/com/android/server/display/WifiDisplayController.java
	services/java/com/android/server/pm/PackageManagerService.java
	services/java/com/android/server/power/DisplayPowerController.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ITelephony.aidl

Change-Id: Ib3f2a28b2a0ea869a541fe1cb25fd97281673839

Conflicts:
	core/java/android/widget/AbsListView.java
	core/java/android/widget/ProgressBar.java
	core/res/res/drawable-xhdpi/cab_background_top_holo_dark.9.png
	core/res/res/drawable-xhdpi/cab_background_top_holo_light.9.png
	core/res/res/drawable-xxhdpi/cab_background_top_holo_dark.9.png
	core/res/res/drawable-xxhdpi/cab_background_top_holo_light.9.png
	core/res/res/values/config.xml
Don't cleanup overlay mapping for non-theme apps

mOverlay structure should keep all app/theme mappings even
if the app does not exist. Otherwise we will have to insert back the mapping
for every app that is installed which would be time consuming.

Without this patch an upgrade app loses its applied theme
until the device is rebooted.

Change-Id: Id02b8e0a3bdd78d1a9d39cd38294c584ef95f8db
Merge tag '4.4.3_r1.1' into HEAD

Conflicts:
	core/java/android/widget/AbsListView.java
	core/java/android/widget/ProgressBar.java
	core/res/res/drawable-xhdpi/cab_background_top_holo_dark.9.png
	core/res/res/drawable-xhdpi/cab_background_top_holo_light.9.png
	core/res/res/drawable-xxhdpi/cab_background_top_holo_dark.9.png
	core/res/res/drawable-xxhdpi/cab_background_top_holo_light.9.png
	core/res/res/values-mcc404-mnc17/config.xml
	core/res/res/values-mcc404-mnc85/config.xml
	core/res/res/values-mcc404/config.xml
	core/res/res/values-mcc520/config.xml
	packages/Keyguard/res/values/cr_colors.xml
	packages/Keyguard/res/values/cr_config.xml
	services/java/com/android/server/NotificationManagerService.java
fix merge conflicts