Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev

am: 90f9398f4e Change-Id: Idb6dabf0d06440f3a2aecc2f4488bb98859f2eae
2017-09-08 22:04:52 +00:00
parent df0e716b43 90f9398f4e
commit ed71e21541
2 changed files with 14 additions and 0 deletions
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -230,6 +230,9 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment

    @VisibleForTesting
    boolean tintTileIcon(Tile tile) {
+        if (tile.icon == null) {
+            return false;
+        }
        // First check if the tile has set the icon tintable metadata.
        final Bundle metadata = tile.metaData;
        if (metadata != null