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
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
HALO: update halo resources on status bar recreation.

- This commit update the state of halo exoanded status bar icon on theme changes

Change-Id: I9775d9e41fc8df452a0e8db6807a8dd099d22868
PEEK: configurable pickup timeout (1/2)

- Allow the user to set different pickup timeout when a notification comes up through PEEK.

Change-Id: Ifcd2f13101dcf6973ebcf016bce5f5314e1ce04c

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationPeek.java
Revert "Set some GC parameters only for dalvik"

This reverts commit de4539603e165f8df0d23a21b6a285213d7f712e.
Send Media button events as foreground Intent

Send foreground intent for Media Button events to Music Player
so that there is no delay in handling these Intents after the
device is rebooted.

Change-Id: I952a8af93586cb96c0a9f6dc910bfb49287f4b9a
CRs-fixed: 611219
[1/2] base: Add Haptic Feedback to quicktiles

Change-Id: Ia3bbb6ef90a9f7b3cf45c341d3b95eb131a96694

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java

Conflicts:
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
Merge remote-tracking branch 'upstream/ose' into ose