diff options
author | Danny Baumann <dannybaumann@web.de> | 2016-02-04 12:31:13 +0100 |
---|---|---|
committer | Danny Baumann <dannybaumann@web.de> | 2016-02-07 23:21:17 -0800 |
commit | c1cb8708adcb8b6cf6b6e665181f957c34d92307 (patch) | |
tree | 2d44c38942aa8ccbb05c5866407fb4104fd95134 | |
parent | a475ad034c359be2f7210d47522b117600616f6f (diff) | |
download | packages_apps_Trebuchet-c1cb8708adcb8b6cf6b6e665181f957c34d92307.tar.gz packages_apps_Trebuchet-c1cb8708adcb8b6cf6b6e665181f957c34d92307.tar.bz2 packages_apps_Trebuchet-c1cb8708adcb8b6cf6b6e665181f957c34d92307.zip |
Don't crash if a theme change intent arrives while we're not running.
RM-208
Change-Id: I35aede5599d307674ef7a593adc5ffcf529ed99a
(cherry picked from commit 3bb6c79ef674e51faf30cd680e21dace539dfcdd)
-rw-r--r-- | src/com/android/launcher3/ThemeChangedReceiver.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/ThemeChangedReceiver.java b/src/com/android/launcher3/ThemeChangedReceiver.java index 9af5da4b7..6dac0be76 100644 --- a/src/com/android/launcher3/ThemeChangedReceiver.java +++ b/src/com/android/launcher3/ThemeChangedReceiver.java @@ -33,7 +33,11 @@ public class ThemeChangedReceiver extends BroadcastReceiver { // components is a string array of the components that changed ArrayList<String> components = intent.getStringArrayListExtra(EXTRA_COMPONENTS); if (isInterestingThemeChange(components)) { - LauncherAppState app = LauncherAppState.getInstance(); + LauncherAppState app = LauncherAppState.getInstanceNoCreate(); + if (app == null) { + LauncherAppState.setApplicationContext(context); + app = LauncherAppState.getInstance(); + } clearAppIconCache(context); clearWidgetPreviewCache(context); app.recreateWidgetPreviewDb(); |