diff options
| author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2019-11-01 22:49:37 +0100 |
|---|---|---|
| committer | Santiago Etchebehere <santie@google.com> | 2020-09-23 17:24:28 -0700 |
| commit | f2a95df22ae9251ce17c8b4617c4f0c39bc40aba (patch) | |
| tree | 68d41814621c03e6edbf08e61f142d0fd1a1c329 | |
| parent | ab03e09b13bfef28fcf1833a2d8fef70b062b2b6 (diff) | |
| download | ThemePicker-f2a95df22ae9251ce17c8b4617c4f0c39bc40aba.tar.gz | |
Properly catch exceptions
Test: Manual, not defining a default theme in stub provider doesn't crash app
Change-Id: I2b33681cffe8670478687c06667a701bb682cf2f
(cherry picked from commit 10252aa2bf4eaa4b41cced2fe9bd0962f7a61421)
| -rw-r--r-- | src/com/android/customization/model/theme/DefaultThemeProvider.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/customization/model/theme/DefaultThemeProvider.java b/src/com/android/customization/model/theme/DefaultThemeProvider.java index ddadc7d8..404130fe 100644 --- a/src/com/android/customization/model/theme/DefaultThemeProvider.java +++ b/src/com/android/customization/model/theme/DefaultThemeProvider.java @@ -188,18 +188,16 @@ public class DefaultThemeProvider extends ResourcesApkProvider implements ThemeB builder.setTitle(mContext.getString(R.string.default_theme_title)); } - String colorOverlayPackage = getOverlayPackage(COLOR_PREFIX, DEFAULT_THEME_NAME); - try { + String colorOverlayPackage = getOverlayPackage(COLOR_PREFIX, DEFAULT_THEME_NAME); mOverlayProvider.addColorOverlay(builder, colorOverlayPackage); } catch (NameNotFoundException | NotFoundException e) { Log.d(TAG, "Didn't find color overlay for default theme, will use system default"); mOverlayProvider.addSystemDefaultColor(builder); } - String fontOverlayPackage = getOverlayPackage(FONT_PREFIX, DEFAULT_THEME_NAME); - try { + String fontOverlayPackage = getOverlayPackage(FONT_PREFIX, DEFAULT_THEME_NAME); mOverlayProvider.addFontOverlay(builder, fontOverlayPackage); } catch (NameNotFoundException | NotFoundException e) { Log.d(TAG, "Didn't find font overlay for default theme, will use system default"); |