summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-04-12 10:57:19 -0700
committerd34d <clark@cyngn.com>2016-04-12 10:57:19 -0700
commit4563e392838a2c72ad336c6d51e7cedfdc7d7732 (patch)
tree8fd21dd6f9b68c0b018808fd3243246d54595a84 /src/com
parent29d8159b82acb0b39ea708382c6f210cdebc7c69 (diff)
downloadpackages_apps_ThemeChooser-4563e392838a2c72ad336c6d51e7cedfdc7d7732.zip
packages_apps_ThemeChooser-4563e392838a2c72ad336c6d51e7cedfdc7d7732.tar.gz
packages_apps_ThemeChooser-4563e392838a2c72ad336c6d51e7cedfdc7d7732.tar.bz2
Avoid potential NPE in getThemeChangeRequestForComponents
Change-Id: I64dbe4d62ab652c014b2087fd1f72096a677de70 TICKET: CYNGNOS-2406
Diffstat (limited to 'src/com')
-rw-r--r--src/com/cyngn/theme/chooser/ThemeFragment.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/cyngn/theme/chooser/ThemeFragment.java b/src/com/cyngn/theme/chooser/ThemeFragment.java
index 103dca0..085b23a 100644
--- a/src/com/cyngn/theme/chooser/ThemeFragment.java
+++ b/src/com/cyngn/theme/chooser/ThemeFragment.java
@@ -2265,7 +2265,11 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
builder.setComponent(component, componentMap.get(component));
}
builder.setRequestType(requestType);
- if (mThemeVersion >= 3) builder.setWallpaperId(mSelectedWallpaperComponentId);
+ if (mThemeVersion >= 3) {
+ builder.setWallpaperId(mSelectedWallpaperComponentId != null
+ ? mSelectedWallpaperComponentId
+ : DEFAULT_COMPONENT_ID);
+ }
return builder.build();
}