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

This commit is contained in:
TreeHugger Robot
2017-03-22 18:34:55 +00:00
committed by Android (Google) Code Review
2 changed files with 9 additions and 1 deletions

View File

@@ -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(

View File

@@ -120,6 +120,14 @@ public class SuggestionFeatureProviderImplTest {
verify(mContext, never()).getPackageManager();
}
@Test
public void dismissSuggestion_noContext_shouldDoNothing() {
mProvider.dismissSuggestion(null, mSuggestionParser, mSuggestion);
verifyZeroInteractions(mFactory.metricsFeatureProvider);
}
@Test
public void dismissSuggestion_hasNoMoreDismissCount_shouldDisableComponent() {
when(mSuggestionParser.dismissSuggestion(any(Tile.class), anyBoolean()))