Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0529a07 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Properly catch exceptions" am: 3740fa07 am: 564698b6 am: e21cfa75 am: 6a2ab5cf 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/1157411

Change-Id: I99dbabe672a5fc457a4a19f2dfab25b76e632199
parents 32632ae4 6a2ab5cf

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

+2 −4
Original line number Diff line number Diff line
@@ -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");