diff options
| author | Dirk Rettschlag <dirk.rettschlag@gmail.com> | 2014-05-13 21:38:47 +0200 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2014-05-13 22:44:12 +0000 |
| commit | ff2884c18c887a515bed9003d92e03aa073bd31b (patch) | |
| tree | e98907d2e295b24bfbbe238a44b43697c4e2b197 | |
| parent | d0f415ae26b2e35508adacc920c8ea4ae809ccce (diff) | |
| download | android_packages_providers_ThemesProvider-ff2884c18c887a515bed9003d92e03aa073bd31b.tar.gz android_packages_providers_ThemesProvider-ff2884c18c887a515bed9003d92e03aa073bd31b.tar.bz2 android_packages_providers_ThemesProvider-ff2884c18c887a515bed9003d92e03aa073bd31b.zip | |
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 <dirk.rettschlag@gmail.com>
(cherry picked from commit dda7d285c2b77770d09ad2abaf4fa09f909d4636)
| -rw-r--r-- | src/org/cyanogenmod/themes/provider/ThemePackageHelper.java | 3 |
1 files changed, 2 insertions, 1 deletions
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. |