Merge "Properly catch exceptions" am: 3740fa075d am: 564698b620
Original change: https://android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/1157411
Change-Id: I1b76d21f5bde3d25fb9eeb24d21d9207250a859d
diff --git a/src/com/android/customization/model/theme/DefaultThemeProvider.java b/src/com/android/customization/model/theme/DefaultThemeProvider.java
index ce12d35..7dc421c 100644
--- a/src/com/android/customization/model/theme/DefaultThemeProvider.java
+++ b/src/com/android/customization/model/theme/DefaultThemeProvider.java
@@ -264,18 +264,16 @@
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");