commit 564698b62009d5268d3aa4b5dab85aebff1a1c0d
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 23 20:35:31 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 23 20:35:31 2020 +0000
tree 5ff0392f25501a08389d6867f49c5b92f9fbcfb8
parent b23d8dc514c10659e1c15d10bcd005e8149495d9
parent 3740fa075d262683dcb25e91e5d5214ac5abcab6

Merge "Properly catch exceptions" am: 3740fa075d

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

Change-Id: Ic933844d0922681147a1352d5c5ae37972478360

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

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