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

am: ed71e21541

Change-Id: Ic2f5d6c35ac8bb7a14d1949be53beb6b6bf4cd16

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