Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat

Conflicts:
	Android.mk
	cmds/bootanimation/BootAnimation.cpp
	core/java/android/provider/Settings.java
	core/java/android/service/gesture/EdgeGestureManager.java
	core/java/android/service/gesture/IEdgeGestureService.aidl
	core/java/com/android/internal/os/ZygoteConnection.java
	core/java/com/android/internal/util/gesture/EdgeServiceConstants.java
	core/res/AndroidManifest.xml
	core/res/res/values/config.xml
	core/res/res/values/dimens.xml
	core/res/res/values/symbols.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
	packages/SettingsProvider/res/values/defaults.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/WallpaperManagerService.java
	services/java/com/android/server/gesture/EdgeGestureInputFilter.java
	services/java/com/android/server/gesture/EdgeGestureService.java
	services/java/com/android/server/gesture/EdgeGestureTracker.java
	services/java/com/android/server/power/DisplayPowerController.java
	services/java/com/android/server/wm/WindowManagerService.java
	telephony/java/android/telephony/PhoneStateListener.java

Change-Id: I92ac2cfddb164c1df8cf16bdc85496ee3533a486
fw/base: themes: update

Themes: Update last postFinish call
* Previous patchset changed postFinish function signature.
Change-Id: Ibe07435e274054c7203504bc4b0877b4df006893

Make theme change broadcast a protected broadcast.
Change-Id: Ic24c840685d18d133dc73ff2637c041c4775f197

Make theme change broadcast a protected broadcast.
Change-Id: Ic24c840685d18d133dc73ff2637c041c4775f197

WallpaperCropper: do not display null bitmaps
It is possible that themes can include a corrupted bitmap,
and the lockscreen will try and display a NULL image resulting in an
empty thumbnail and applying it will cause the app to crash.
Change-Id: Ie0770486a9d58050a5f296a219d844a39937421e
Signed-off-by: Roman Birg <roman@cyngn.com>

Cleanup app->{theme1,theme2...} mapping on uninstall
Change-Id: I24b43e8817db1927d5b43fcf7ad3340269d046ea

Themes: Delete icon resources during uninstall
Change-Id: Icf247642f9d246c8826f3394f873e4b434ad2b3f

Themes: remove unused code
Change-Id: I5ee8de962c40ddc5fcfbbc0332a9e389223e716c

Themes: Handle apps using "original-package" tag
Before this patch the themes code assumed the pkgName from PackageInfo was equal to the
manifest value. This is not the case however for upgraded system apps that have gone
through a pkg-name change. For example, Trebuchet was "com.android.launcher3" and now
it is "com.cyanogenmod.trebuchet". If the device had wiped data then PM would use the new
pkg-name, but if the system apps were being upgraded then PM would use the old name which is
now different from the manifest name.

Change-Id: Ie7eb1b4e17899d1055535dc890d4f7a7bca9a98a

Themes: Add '|' delimited list of components to broadcast
Change-Id: I742dcb0f502b6089dee584a92a3792016f2a9799

Fix resource leaks
Change-Id: I3a201cfd924e467d605351782bd06874c2af725e

Revert "Reduce memory leaks by removing all views."
This reverts commit 8df12e5.

Signed-off-by: houst0nn <houstonn@gmail.com>
appops: Fix WIFI_SCAN AppOp permission index

WIFI_SCAN and POST_NOTIFICATION permissions are inverted.

Change-Id: I97ebba0e118604294eb474143c53f7e7238dcb59
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
apn: national roaming for ONO (Spain)

ONO uses the Movistar network (214 07)
JIRA: CYAN-4247
Issue: https://jira.cyanogenmod.org/browse/CYAN-4247

Change-Id: Ifb62f631df9f8441e1c03f3d58c98a17572c7077
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
fw: media: Handle NPE due to threading race

Change-Id: I6eab5bc3d687edfa6f0839e439b3314bed4fdcea
immersive mode: don't unconfirm a package, that's just dumb

* This is very annoying for specialized apps
* See here for a great explanation http://stackoverflow.com/a/20309721
* The fact that it doesn't even notify the user until the NEXT time they
  run it makes it completely pointless in my opinion anyway.

Change-Id: I423611efc07d467e1d81c66d58adcff331be8b38

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Merge branch 'kitkat' of github.com:AOSPA-legacy/android_frameworks_base into kk4.4

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
	services/java/com/android/server/power/DisplayPowerController.java

Change-Id: Ifd57df4ab39031b37cabcaaaeeb0ac4d62cfc200