Merge "Catch error when we fail to get slice icon."

2018-12-06 22:25:48 +00:00
parent f80e5b561e 69a56b42a1
commit a5cafaad3a
2 changed files with 20 additions and 1 deletions
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -449,6 +449,12 @@ public class SliceBuilderUtils {
        if (iconResource == 0) {
            iconResource = R.drawable.ic_settings;
        }
-        return IconCompat.createWithResource(context, iconResource);
+        try {
+            return IconCompat.createWithResource(context, iconResource);
+        } catch (Exception e) {
+            Log.w(TAG, "Falling back to settings icon because there is an error getting slice icon "
+                    + data.getUri(), e);
+            return IconCompat.createWithResource(context, R.drawable.ic_settings);
+        }
    }
 }