commit 4333ac1e2ed29c6970302086529ab17b3261e35c
author Doris Ling <dling@google.com> Wed Apr 25 10:22:36 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 25 10:22:36 2018 -0700
tree e1420455c623cd0a4bfd0f58ec659933eb933fc6
parent ca44caa663c8a4af4e108903c0f1e4bff21bc910
parent c7494be56ecafc3e7fe7ade2d50f5fed38d4cd97

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

Change-Id: I06db8956a4cb67aa650b7b32dab1c83130d7a97a

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 165ed37..843f026 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()));
                     }
                 );
             });