idmap: Don't log spam "CREATING STRING CACHE"

Change-Id: Idce5aa5881c8e860eca9749cc85f748303c913c0
Fix a NPE when putting a null-Bundle in an Intent

Happens frequently e.g. with GoogleAccountAuthenticator

Change-Id: I284bf153f40ee9cc3e70bce6efcc3b9e6706361b
frameworks/base: Fix change propagating issue

destroyLayer() function has been modified in kk. It is not correct
to propagate the UI corruption fix from jb to kk without considering
the new changes made in kk. This change is to make it align with
the new code in kk.

Change-Id: I34d11b230b9390fe8a989ab6f9c7d3a48d586205
Allow configuration of the default screen-off animation style

Change-Id: Ib59f8fce45c11193104682b975ff6467df8cfc15
frameworks: allow Keyguard package to be defined in overlay

This way, custom keyguards can have their own namespace.

Change-Id: Ia2dfa57652c6f3d3404963897fb2f20a265e5c76
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge remote-tracking branch 'cm/cm-11.0' into HEAD
Revert "Allow configuration of the default screen-off animation style"

This reverts commit 4d25afe549bb80964dcb12cda9587a1d8bdac844.
Update the GPS tile in the constructor

Change-Id: I985ba2ab769e67c0d43fc67922fe1174bba195f4
frameworks: move keyguard wallpaper to system  (1/2)

Change-Id: I0eb1b5578b705c2ade4c0772fa86e09478b9f73e
Signed-off-by: Roman Birg <roman@cyngn.com>
Return system theme when SecurityException is caught.

Isolated processes cannot access content resolvers so a SecurityException
will be thrown when calling getBootTheme.  This catches that
exception and returns sSystemTheme.

Change-Id: If4077adef4c657b80ba2c52a6610126dabe4ffdf
Merge "idmap: Don't log spam "CREATING STRING CACHE"" into cm-11.0
Merge "Fix a NPE when putting a null-Bundle in an Intent" into cm-11.0
Merge "Update the GPS tile in the constructor" into cm-11.0
Revert "frameworks: move keyguard wallpaper to system  (1/2)"

This reverts commit 89e4d54db78c0a1fefa92b8227511634bbc970d4.
Revert "Return system theme when SecurityException is caught."

This reverts commit 147e7cb086aa324fae226e8f851e552475654fa2.
Merge commit 'a71056b' into HEAD

Conflicts:
	libs/androidfw/ResourceTypes.cpp
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

Change-Id: I6fbcb4d243deae8daab9002921f43b949ceec3fe
Revert "Update the GPS tile in the constructor"

This reverts commit 98cb24b38aa085cbf6e494fa52c0697b7bd463e8.
Revert "frameworks: allow Keyguard package to be defined in overlay"

This reverts commit 71aed47cf38ce8d577f8a0e1314a2350074c8fa3.

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

Change-Id: I684e8e43090c32ec9def11dd0a66d82099e40e89
Merge remote-tracking branch 'upstream/kk44' into kk44