From dda7d285c2b77770d09ad2abaf4fa09f909d4636 Mon Sep 17 00:00:00 2001 From: Dirk Rettschlag Date: Tue, 13 May 2014 21:38:47 +0200 Subject: Fix NPE if themeContext is null When installing a new theme it sometimes happens that the ThemesProvider crashes due to a NullPointerException in hasThemeComponent(...) when executing AssetManager assetManager = themeContext.getAssets(); Don't silently catch the NameNotFoundException and return an empty map. Change-Id: I9d7bf8f79b9c38cd5da668a7fcf205406ffdd79c Signed-off-by: Dirk Rettschlag --- src/org/cyanogenmod/themes/provider/ThemePackageHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/org/cyanogenmod/themes/provider/ThemePackageHelper.java b/src/org/cyanogenmod/themes/provider/ThemePackageHelper.java index 73900a4..7a6fe42 100644 --- a/src/org/cyanogenmod/themes/provider/ThemePackageHelper.java +++ b/src/org/cyanogenmod/themes/provider/ThemePackageHelper.java @@ -208,7 +208,8 @@ public class ThemePackageHelper { try { themeContext = context.createPackageContext(pkgName, Context.CONTEXT_IGNORE_SECURITY); } catch (NameNotFoundException e) { - e.printStackTrace(); + Log.e(TAG, "Error getting themeContext during insert", e); + return Collections.emptyMap(); } // Determine what components the theme implements. -- cgit v1.2.3