commit c7494be56ecafc3e7fe7ade2d50f5fed38d4cd97
author Doris Ling <dling@google.com> Wed Apr 25 10:16:05 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 25 10:16:05 2018 -0700
tree e8ad93b4c475b0bc442ad987d19c243c7c3f17f3
parent e9045a7a41a219c1e6c4b11001f0342295928699
parent abe44c2674a10e33498816ec0befb5cac292a87d

Merge "Fixes crash in security settings." into pi-dev
am: abe44c2674

Change-Id: I6d0730a148fbfecaaa4b94e376550af613ad174b

src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java

diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 82a5b9b..f403e05 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -258,10 +258,9 @@
                     Log.w(TAG, "Failed to get icon from uri " + uri);
                     return;
                 }
-                tile.icon = Icon.createWithResource(iconInfo.first, iconInfo.second);
+                final Icon icon = Icon.createWithResource(iconInfo.first, iconInfo.second);
                 ThreadUtils.postOnMainThread(() -> {
-                        preference.setIcon(tile.icon.loadDrawable(preference.getContext()));
-                        tile.icon = null;
+                            preference.setIcon(icon.loadDrawable(preference.getContext()));
                     }
                 );
             });