From 4563e392838a2c72ad336c6d51e7cedfdc7d7732 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Tue, 12 Apr 2016 10:57:19 -0700
Subject: Avoid potential NPE in getThemeChangeRequestForComponents

Change-Id: I64dbe4d62ab652c014b2087fd1f72096a677de70
TICKET: CYNGNOS-2406
---
 src/com/cyngn/theme/chooser/ThemeFragment.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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();
     }
 
-- 
cgit v1.1