Merge "Properly catch exceptions" (3740fa07) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/customization/model/theme/DefaultThemeProvider.java

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -264,18 +264,16 @@ public class DefaultThemeProvider extends ResourcesApkProvider implements ThemeB
	builder.setTitle(mContext.getString(R.string.default_theme_title));		builder.setTitle(mContext.getString(R.string.default_theme_title));
	}		}

	String colorOverlayPackage = getOverlayPackage(COLOR_PREFIX, DEFAULT_THEME_NAME);

	try {		try {
			String colorOverlayPackage = getOverlayPackage(COLOR_PREFIX, DEFAULT_THEME_NAME);
	mOverlayProvider.addColorOverlay(builder, colorOverlayPackage);		mOverlayProvider.addColorOverlay(builder, colorOverlayPackage);
	} catch (NameNotFoundException \| NotFoundException e) {		} catch (NameNotFoundException \| NotFoundException e) {
	Log.d(TAG, "Didn't find color overlay for default theme, will use system default");		Log.d(TAG, "Didn't find color overlay for default theme, will use system default");
	mOverlayProvider.addSystemDefaultColor(builder);		mOverlayProvider.addSystemDefaultColor(builder);
	}		}

	String fontOverlayPackage = getOverlayPackage(FONT_PREFIX, DEFAULT_THEME_NAME);

	try {		try {
			String fontOverlayPackage = getOverlayPackage(FONT_PREFIX, DEFAULT_THEME_NAME);
	mOverlayProvider.addFontOverlay(builder, fontOverlayPackage);		mOverlayProvider.addFontOverlay(builder, fontOverlayPackage);
	} catch (NameNotFoundException \| NotFoundException e) {		} catch (NameNotFoundException \| NotFoundException e) {
	Log.d(TAG, "Didn't find font overlay for default theme, will use system default");		Log.d(TAG, "Didn't find font overlay for default theme, will use system default");