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

Commit f2a95df2 authored by Luca Stefani's avatar Luca Stefani Committed by Santiago Etchebehere
Browse files

Properly catch exceptions 

Test: Manual, not defining a default theme in stub provider doesn't crash app
Change-Id: I2b33681cffe8670478687c06667a701bb682cf2f
(cherry picked from commit 10252aa2)
parent ab03e09b

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");