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

am: c7494be56e

Change-Id: I06db8956a4cb67aa650b7b32dab1c83130d7a97a
This commit is contained in:
Doris Ling
2018-04-25 10:22:36 -07:00
committed by android-build-merger

View File

@@ -258,10 +258,9 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
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()));
}
);
});