From f9e985d018e824c043b62691b4a8f9bd2610ca3a Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 30 Oct 2017 15:50:44 -0700 Subject: [PATCH] Enable suggestion v2 experiment Bug: 68662574 Test: robotests Change-Id: Ib8aeef45ebe1260e9c8699e231db37840a0ce3db --- .../SuggestionFeatureProviderImpl.java | 2 +- .../SuggestionFeatureProviderImplTest.java | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java index 783987dc8b0..1be31b44e2e 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java @@ -92,7 +92,7 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider } private static boolean isV2Enabled() { - return FeatureFlagUtils.isEnabled(FEATURE_FLAG_SUGGESTIONS_V2); + return FeatureFlagUtils.isEnabled(FEATURE_FLAG_SUGGESTIONS_V2) || true; } @Override diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java index 5e567144a2e..8feef923f1b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java @@ -132,13 +132,6 @@ public class SuggestionFeatureProviderImplTest { assertThat(mProvider.isSuggestionEnabled(mContext)).isFalse(); } - @Test - public void isSuggestionEnabled_isNotLowMemoryDevice_shouldReturnTrue() { - when(mActivityManager.isLowRamDevice()).thenReturn(false); - - assertThat(mProvider.isSuggestionEnabled(mContext)).isTrue(); - } - @Test public void isSuggestionV2Enabled_isNotLowMemoryDevice_sysPropOn_shouldReturnTrue() { when(mActivityManager.isLowRamDevice()).thenReturn(false); @@ -147,14 +140,6 @@ public class SuggestionFeatureProviderImplTest { assertThat(mProvider.isSuggestionV2Enabled(mContext)).isTrue(); } - @Test - public void isSuggestionV2Enabled_isNotLowMemoryDevice_sysPropOff_shouldReturnTrue() { - when(mActivityManager.isLowRamDevice()).thenReturn(false); - SettingsShadowSystemProperties.set( - FeatureFlagUtils.FFLAG_PREFIX + mProvider.FEATURE_FLAG_SUGGESTIONS_V2, "false"); - assertThat(mProvider.isSuggestionV2Enabled(mContext)).isFalse(); - } - @Test public void dismissSuggestion_noParserOrSuggestion_noop() { mProvider.dismissSuggestion(mContext, null, (Tile) null);