Merge "Fix a monkey crash when it dismisses suggestion."

2017-03-22 18:34:55 +00:00
parent fb8e0dc545 8c8c4077fe
commit ceb46ac8e7
2 changed files with 9 additions and 1 deletions
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -63,7 +63,7 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider

    @Override
    public void dismissSuggestion(Context context, SuggestionParser parser, Tile suggestion) {
-        if (parser == null || suggestion == null) {
+        if (parser == null || suggestion == null || context == null) {
            return;
        }
        mMetricsFeatureProvider.action(